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

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