[automerger skipped] Mark ab/7061308 as merged in stage. am: 6d1361300f -s ours am: 00669d8110 -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: I2ba3527640ae7fad7b583d7f37bd0eed17d8a7ee
tree: 973d53e8cf2c9718d9b112b7c7390932e69fc768
  1. Android.bp
  2. switcher4.py