Merge "Make EmergencyInfo's settings searchable." into oc-dr1-dev
am: 46c2e06168

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