am 7293a99b: am aab92012: Merge "Catch CP2 exception in DefaultVoicemailNotifier" into mnc-dev

* commit '7293a99b7c8299c8e0fa0566322fe39093ccc760':
  Catch CP2 exception in DefaultVoicemailNotifier
tree: 585becb055b6983eb7d99f6485f4ac89f8ed1f23
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags