OSDN Git Service

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

Change-Id: Ib7d580fe143734fe202829dba8363985bc8406b7


Trivial merge