Merge "Fix jank when loading emergency info." into oc-dr1-dev am: ce2c089ef9 am: dca1380b08
am: c8b80ccd6b

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