am 8e578cfe: am c3cb63b6: Merge "Fix possible FragmentManager NPE in Dialer" into klp-dev

* commit '8e578cfe6e9ce424c64d92044c19ed24c0bd7eee':
  Fix possible FragmentManager NPE in Dialer
tree: 6f3ded7b11a026222a74ca61fd29559a5879ab2c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags