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

am skip reason: Change-Id Ic969718084953876ee910ad057e4cca8645fc25a with SHA-1 a8c9556a58 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5f4490ea0c3f67b501283f1a212e521edd14791
tree: 610be6a2dfcd8bea6abed95268b5520317622beb
  1. oem_template/
  2. src/
  3. testing/
  4. Android.bp
  5. Android.mk
  6. OWNERS
  7. proguard.cfg
  8. README