tree 9d69fa876bc227d357b1c79d5638059f79fc89a3
parent 7205c295e85473e7c48504f5009cab9ae44278f0
parent 86666e2852262162f5ba101b9ab054f981777ef1
author Yorke Lee <yorkelee@google.com> 1384277428 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384277428 -0800

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

* commit '86666e2852262162f5ba101b9ab054f981777ef1':
  Fix possible FragmentManager NPE in Dialer