tree b4edf335d4d88c9e9285cfcc047f790f4532006d
parent acabba90c1a400e1c2f88f0b1c8f048afb07a5d0
parent ca9b20f9624f66ace46de2e50718b255a3c06843
author weijiaxu <weijiaxu@google.com> 1519705674 +0000
committer android-build-merger <android-build-merger@google.com> 1519705674 +0000

Merge "Fix for NonSimulatorConnection listener causing dialer crashing after ending a call." am: 46cdf805e0 am: 0ed650e203
am: ca9b20f962

Change-Id: I71be1b8817bbd6d263745399ac62321b1e9e3722