am 516c9547: am e2390461: Merge "Fix crash in Dialer when CP2 is disabled"

* commit '516c95472d83a85769285c54fe9bc949c62a645a':
tree: c2175942e3a631ad112fe6ab17da560c45fc1ae2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags