[automerger skipped] Mark ab/7061308 as merged in stage. am: 94d45bf10a -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: I24e7ac3996684d2f64230d6dc1aaee1d395f7575
tree: 2a3d89e20851f72879b89396838d8497fc7749a2
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. NOTICE
  7. OWNERS
  8. proguard.flags