Merge changes Idb3f486e,I534e1d22

* changes:
  Implement SIM swapping
  Set an appropriate icon for the call detail UI's callback button.
tree: 35bbae5a10d673a11eec6f20954305bc2eb9aa4f
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE