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

* commit 'e2390461aa1612028f59760af57230cff8ab261b':
  Fix crash in Dialer when CP2 is disabled
tree: 190096f4ae8ded6f706cc0c45bc58b83366b9455
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags