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 21:24:39 +0000 (14:24 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 May 2018 21:24:39 +0000 (14:24 -0700)
commitbf8badd414a13166a4df2fbad309dc2c600aa9bd
tree953f4bb952e20f36fd53a87bf30010585433e887
parentea490882a30f1d7b2d35f017da44a8fdf72c6606
parentd2caee61ded31cd6bb1d807c805eeecae49789cf
[automerger skipped] Merge "Move Gallery2 over to AAPT2 and new v4 modules" am: 2813902e4e am: 2324f6d428  -s ours
am: d2caee61de  -s ours

Change-Id: Ia556e09db32faefb59ede806a2f3cf647be02a05