tree ad1c0ee844bd185e43f428d09120bac1975f56ac
parent 5ab3fff7ee80622fca275bcbbf36fb085f4bd48a
parent 4015318e301498aeae1ca7c2f297073d80132063
author Hall Liu <hallliu@google.com> 1503443457 +0000
committer android-build-merger <android-build-merger@google.com> 1503443457 +0000

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

Change-Id: I705ccabfeb060dccbff53676293506501e3398cc