Merge "Add a settings suggestion for EmergencyInfo." into oc-dr1-dev am: a465e6930d
am: dff7a1ded7

Change-Id: I6ed4ea44c104287f269c070968608cbeab687ab2
tree: eb21357b433029c222e28c4d353a7bc4d4099e60
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags