Merge "Updating emergency location code to use non-deprecated location apis"
am: 7c54c42584

Change-Id: Ia3cd588e5608611abeaf54e4bf97740805d33bc8
tree: f335b4bc18f85f9a27a762031a06d7f4cf386f2e
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE