[automerger skipped] Mark ab/7061308 as merged in stage. am: 1280e16c4b -s ours am: e62480a10a -s ours

am skip reason: Change-Id Ia1c6695883c59ee504315988793b9b3c34e9221a with SHA-1 caeefb9009 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72bfded18cc50f2bac490d029881ed00566d77f9
tree: 6958bcc76b4425b782d9666f1979589e058108bd
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE
  8. OWNERS