am 9a8b98d1: am 33cca17c: Merge "Fix dialer monkey NPEs" into mnc-dev

* commit '9a8b98d1dbeaa348de9324271601e919b60858dc':
  Fix dialer monkey NPEs
tree: 5a2b7eee2c55bbb4ca138aaaa32f53a40e18cbe0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags