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

am: efc5505b7a  -s ours

Change-Id: I3996a2af4e940eafcf564c20dacc077dad9d2339
This commit is contained in:
android-build-prod (mdb)
2018-05-07 18:40:37 -07:00
committed by android-build-merger

Diff Content Not Available