[automerger skipped] Mark ab/7061308 as merged in stage. am: 56d850d9e4 -s ours am: 709fed4553 -s ours

am skip reason: Change-Id Ib86d80f0150ed2072f1e4f68aaed6ab45a51050b with SHA-1 57c174cee1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I136b96b0ee6b2a79951ced06a73e164ad238869d
tree: 3d466b0f200f7c919b6490140d544266e5fbc284
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS