[automerger skipped] Mark ab/7061308 as merged in stage. am: d5e97b5a8e -s ours am: b5dc52a680 -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: I58eaf5d22dc0b060884d8e62ea8d12f716680043
tree: 860418dc0f3f44123129ec169ecbf1d9d65d25da
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS