[automerger skipped] Mark ab/7061308 as merged in stage. am: 6d1361300f -s ours am: 00669d8110 -s ours am: 34cd2310fa -s ours

am skip reason: Change-Id I35781ad4005ec0cfb2cf9523fe6b5a2e4f934456 with SHA-1 f0917e737b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0868288797cd7a6b145de530a216891f1f586d1d
tree: 973d53e8cf2c9718d9b112b7c7390932e69fc768
  1. Android.bp
  2. switcher4.py