am 2ec046f5: am 846161d9: (-s ours) am aab92012: Merge "Catch CP2 exception in DefaultVoicemailNotifier" into mnc-dev

* commit '2ec046f5d5296d3d2563d003de4403b9c3db8fe7':
tree: 84230245b6d0620425180d5fab12ff558de999ab
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags