tree b3aa80cfee2d58ef357993cecd6832ef78d7286f
parent d7daccbfc08032d82466bdf432ab9ccf8b8f0dc2
parent d57e403dd041c883fc9b2d3f52cbaed7793870ce
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1542092867 -0800
committer android-build-merger <android-build-merger@google.com> 1542092867 -0800

Merge "Fix mis-ordered merge in PhoneStateListener.java" am: a97bdb957f
am: d57e403dd0

Change-Id: I7759d933eae873879a5e3677397baebd1c356747