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

am: 322e77d3d1 Change-Id: If79bf6eff63fe2ca430a73835388e441bebbbb7f
2018-11-12 23:22:35 -08:00
parent ac91c6eb47 322e77d3d1
commit ea0fb2dbcc
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -858,4 +858,4 @@ public class PhoneStateListener {
    private void log(String s) {
        Rlog.d(LOG_TAG, s);
    }
-}
+}