From: Ying Wang <wangying@android.com>
Date: Fri, 23 Oct 2015 18:27:25 +0000 (+0000)
Subject: Merge "Make sure R.stamp is always created" am: 47e46f7725 am: 3d7584d9c3
X-Git-Tag: android-x86-7.1-r1~818
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=62170e20046fcac86de3cf5d6425a68c7ed89a99;p=android-x86%2Fbuild.git

Merge "Make sure R.stamp is always created" am: 47e46f7725 am: 3d7584d9c3
am: a34fb5fe34

* commit 'a34fb5fe3445bf6f185720a3f029da4d39268dc6':
  Make sure R.stamp is always created
---

62170e20046fcac86de3cf5d6425a68c7ed89a99