[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c16a3e3e6 -s ours am: 430d20d046 -s ours

am skip reason: Change-Id I71ae706b6893ed47cf456938b35ed5e2b319ea50 with SHA-1 0514655f3b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaec1b7ea6a7511296dbca38ef72618ff163f882
tree: 89f0a8633ccb6a4a6b832776d8f9f15504c1476e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS