Merge "Reimplement EmergencyInfo with the support library." into oc-dr1-dev am: 8506031c67
am: cda3fcada8

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