am 65ea6334: Merge "Protect against CP2 crash in Dialer" into mnc-dev

* commit '65ea6334c0a9ad6324f2b81849ec09f9e97d6934':
  Protect against CP2 crash in Dialer
tree: 517d24b541fddb4db02920d97e98d8f0bb7bd5bd
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags