OSDN Git Service

Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f
authorAdam Lesinski <adamlesinski@google.com>
Thu, 13 Apr 2017 07:07:15 +0000 (07:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 07:07:15 +0000 (07:07 +0000)
am: cb276fa531

Change-Id: I199b76e76a9ed5d4e79ec54830060779eb27c548


Trivial merge