OSDN Git Service

[automerger skipped] Merge "Move Gallery2 over to AAPT2 and new v4 modules" am: 28139...
authorColin Cross <ccross@android.com>
Mon, 7 May 2018 20:34:43 +0000 (13:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 May 2018 20:34:43 +0000 (13:34 -0700)
am: 2324f6d428  -s ours

Change-Id: I5e1792e11ce2bc2e7db1bcefc5b5eff48acb00ba


Trivial merge