tree 3f2492e04b5920a6e437ab4b09c52a95f34f78a4
parent 7489b599052840ba6950c60604851bd2491cd78b
parent a34fb5fe3445bf6f185720a3f029da4d39268dc6
author Ying Wang <wangying@android.com> 1445624845 +0000
committer android-build-merger <android-build-merger@google.com> 1445624845 +0000

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

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