Merge "Fix dialer monkey NPEs" into mnc-dev
tree: ce3968035941f213afa12e574d0f3cd24e1bf9c8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags