Merge changes Ie12fd2f4,If92e7595

* changes:
  Handle race condition with CallComposerActivity.onBackPressed
  Skeleton implementation of PhoneLookup and Cp2PhoneLookup.
tree: d51a48886fe21dc7b2ed4ac17fbae3dd382c5f79
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE