Merge "Add new class EmergencyContactManager" into nyc-dev
tree: 4d3e86a1a90212a3b99c5d86081bc43bc5f25157
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml