am 4c9a8cf0: Merge "Fix potential Dialer NPEs" into mnc-dev

* commit '4c9a8cf050defaf1bb48a8005fd609c21bbfbc21':
  Fix potential Dialer NPEs
tree: 032221a0e9fbed1e256e37c58c17bb3dbe74ab06
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags