Merge "Fix jank when loading emergency info." into oc-dr1-dev
tree: ce293022dc13b1ab171e7baf747f15e899f0b99c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags