From: Android Build Merger (Role) Date: Thu, 13 Apr 2017 07:07:54 +0000 (+0000) Subject: Merge "Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f am: cb276fa531" X-Git-Tag: android-x86-8.1-r1~1199 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=380163d475131a6d84fd9111e0254c0db12386e8;p=android-x86%2Fframeworks-base.git Merge "Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f am: cb276fa531" --- 380163d475131a6d84fd9111e0254c0db12386e8