tree 91b199588d23addeb52a2c92065da3931bc9259e
parent 5d9a7e454c5c71ef15527f06278b18996d0cc191
parent 54cadb79d3d2ef5be670d2fbd6e566f0a5f7f428
author Wink Saville <wink@google.com> 1348100630 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348100630 -0700

am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '54cadb79d3d2ef5be670d2fbd6e566f0a5f7f428':
  Telephony: Fix npe in IccPhoneBookInterfaceManager