[automerger skipped] Mark ab/7061308 as merged in stage. am: c9aa4a2a57 -s ours am: fd308fc875 -s ours am: c1a05b5d48 -s ours

am skip reason: Change-Id Ic471ee62731ed95439bb6748ee89546c58c5dfbb with SHA-1 3342435f15 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b86af0a550609332fc59330cfe6c0bac20f3ac3
tree: b09dcfc88258ee3ff184481ad4010ede9a29fe00
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml