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

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