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

am skip reason: Change-Id I3521be1e467cffb8caea51e0c45d445613b87ba3 with SHA-1 07c0f71192 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78f793ce606c9762561a229b1d219b48c9b687e5
tree: 58011f9cea9b6610fd36096c104012a2e7051062
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS