Merge "Make EmergencyInfo's settings searchable." into oc-dr1-dev
tree: d0b8cfe46289e4690254499bc44d5e9fb21e881a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags