[automerger skipped] Merge "Move SettingsLib tests and EasterEgg to aapt2." am: 846fbd0806

am: cf93b96726  -s ours

Change-Id: Icb78b81f8e7bc49e2925bf690ce6f0e18f45e955
This commit is contained in:
android-build-prod (mdb)
2018-05-07 16:03:17 -07:00
committed by android-build-merger

Diff Content Not Available