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

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