[automerger skipped] Mark ab/7061308 as merged in stage. am: 94d45bf10a -s ours am: 95bedf7e65 -s ours

am skip reason: Change-Id I8fedf97c82359807955bbede62984e1a46ae83b7 with SHA-1 ce3966dab2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9160c5f478013e9433691cabc5b6cbf57626688a
tree: 3b9aa425bdc980d4c5a5417dee8022ec4e893051
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. NOTICE
  7. OWNERS
  8. proguard.flags