tree c7e237e11f9d9d0a4f8be8f21844451998a3d471
parent bd81f4e550b3b2bbd39156a0be5c3096b021d657
parent 2c28f2882e55d215f807585ce6968bed6d1e0983
author Tyler Gunn <tgunn@google.com> 1517444898 +0000
committer android-build-merger <android-build-merger@google.com> 1517444898 +0000

Merge "Change TelephonyConnection to use onDisconnect callback from original conn." am: e9954848fc
am: 2c28f2882e

Change-Id: Id33ff99b21a317daf8f18c0ab3df123bb798b0cb