tree 3eb09d4c4f2a079ef28b435f611793f0be2f1ccd
parent ac91c6eb478f7e694aab114732ace259b65d160d
parent 322e77d3d1f0d247668aa29766e92373786261fb
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1542093755 -0800
committer android-build-merger <android-build-merger@google.com> 1542093755 -0800

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

Change-Id: If79bf6eff63fe2ca430a73835388e441bebbbb7f