OSDN Git Service

Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
authorShuo Qian <shuoq@google.com>
Wed, 25 Apr 2018 00:12:10 +0000 (17:12 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Apr 2018 00:12:10 +0000 (17:12 -0700)
commit2413d7e6f85fa3f82c4a0a36d9c9251ec8ae7203
tree75fbad4cc0e790e6a6243cdf55609153bcde3848
parent91d15b83c31b8ce494905e478085a1ce0912665a
parentc4c7c19b6723680dd0b3322fd667a757e259d178
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
am: c4c7c19b67

Change-Id: I453a20d444aeaff500b6272fb352494420699557
telephony/java/android/telephony/PhoneStateListener.java
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl