Merge "Revert "Remove emergency info launcher icon"" into nyc-dev
tree: 9f99fc9fc225c9f99560b1c80ec62137083d6430
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml