[automerger skipped] AAPT2: Update SDK development codename to Q am:...
[automerger skipped] AAPT2: Update SDK development codename to Q am: ad5b4ba2 am: 1661ba81 -s ours
am: 32d1a0b2 -s ours
am skip reason: change_id I815e0bfc786660d6ad70897287fb5fb21023068c with SHA1 eb9c9ac8 is in history
Change-Id: I2a24b0f220f237604ce85739d8a0aa670fd8f173