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)
commitd2caee61ded31cd6bb1d807c805eeecae49789cf
treed9534d9f946bdb34d494eb1c6a5fa63a2314f0fc
parentcb50682538c0e2ec3dcf0ac59f5a2e725b7a5803
parent2324f6d428913a3196c9f93cc869d34df626268f
[automerger skipped] Merge "Move Gallery2 over to AAPT2 and new v4 modules" am: 2813902e4e
am: 2324f6d428  -s ours

Change-Id: I5e1792e11ce2bc2e7db1bcefc5b5eff48acb00ba