Merge SP1A.201015.001
Change-Id: I049687c588438365ef70cb28f611ced2c916087b
tree: f95263c33a855c69a499c737fe82a0ab9970ddd7
  1. Android.bp
  2. switcher4.py