OSDN Git Service

[automerger skipped] Merge "Move SettingsLib tests and EasterEgg to aapt2." am: 846fb...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Mon, 7 May 2018 23:03:17 +0000 (16:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 May 2018 23:03:17 +0000 (16:03 -0700)
commitefc5505b7a37255f1b95bb5607b75564fa2e7e9e
tree8c48aa5b8ba1136ec95bd56c399fdd28cc2c31a7
parentdfad0653b23784084b32836d121167378a4f2ec5
parentcf93b96726d4e084780ed274385af1f27d1d416b
[automerger skipped] Merge "Move SettingsLib tests and EasterEgg to aapt2." am: 846fbd0806
am: cf93b96726  -s ours

Change-Id: Icb78b81f8e7bc49e2925bf690ce6f0e18f45e955