tree ed66f6bcb6c5f76b95374d936134770b2edf26cd
parent 60a0d79da8cb6bb6cb613d4fc2c998591dbbf833
parent 98f50ccfef2999a41957af81423fab5fa1905e95
author Hall Liu <hallliu@google.com> 1503444856 +0000
committer android-build-merger <android-build-merger@google.com> 1503444856 +0000

Merge "Fix two NPEs in TelephonyConnection" am: 4851b4b90b am: 0efd089ffe am: 03745989a9 am: 4015318e30
am: 98f50ccfef

Change-Id: Ifaef0e1a8e9df9ab5bc2b14dfa64a05af73c6c5f