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

am skip reason: Change-Id I34b46ad2035d4570da6f68293ecc977916c702aa with SHA-1 17fa819502 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48be08112ced26b64b68559678f931d999329aba
tree: 88c16a33397cc2cf42fbdcd19f952a303e6939f6
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml