Merge "Fix jank when loading emergency info." into oc-dr1-dev am: ce2c089ef9 am: e956f742ae
am: 3fa66e3034

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