[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:
committed by
android-build-merger
commit
2bf6c453f0