Merge "Added workaround for sim switch in preflight" am: ed6b424dc0 am: 3da2dee146 am: e1167d2169 am: 30f374224e am: c1f6d6f91b
am: e652e6effd

Change-Id: Ib47069eb54db80d42d05a6aa2e1cb92ab134b63c
tree: d2bab879baf1ee78e9476c95d98525496ec5577c
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg