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

* commit '7b5e41b5aca925ef476bf670a1f65f1cb51bac83':
  Telephony: Fix npe in IccPhoneBookInterfaceManager
tree: bba5ae10f4c9e449f335be9bb7a63f903297d169
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk