[automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s ours am: dac515acc9 -s ours

am skip reason: Change-Id Icb7b03ca404c32460b1bea7d94a4d891d707134b with SHA-1 f8600c44c7 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib57a1b916044a7965afc0a32668610ec2e22981b
tree: 33f684fad1b62c4b087738cb8c51a817de70509f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. proguard.flags