OSDN Git Service

Merge "Fix errors caught by aapt2" am: 6d78fe0385
authorColin Cross <ccross@android.com>
Wed, 16 May 2018 00:15:49 +0000 (17:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 May 2018 00:15:49 +0000 (17:15 -0700)
commit3bc01b208270eb224deffb68441dfc3d212cde98
treed9fe698bf844a40e22a8f4f704f1bdbc849a8dae
parentf10a0c71c1b4d0238ee7cfc9bfab2ed633a4817a
parentef9db6bfb63e5a83a1fcfdb6941b86056c271112
Merge "Fix errors caught by aapt2" am: 6d78fe0385
am: ef9db6bfb6

Change-Id: I249627820aabdabc3e0d06c82450efe8830934bc