OSDN Git Service

Merge "Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f am: cb276fa531"
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 13 Apr 2017 07:07:54 +0000 (07:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Apr 2017 07:07:58 +0000 (07:07 +0000)

Trivial merge