OSDN Git Service

Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7 am: 50f29d8ecf
authorJordan Liu <jminjie@google.com>
Fri, 6 Jul 2018 19:25:08 +0000 (12:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 19:25:08 +0000 (12:25 -0700)
commitd75e31fbce38a4a2760b7c6c045261197022fa01
treebe4098c4b9ad037f7a6f5c457585f5f14256d126
parentd707da9c77073ad419c344e42f3cfd132f0f5f90
parentbf4acfb71bd075fca1a9dde699832d2463fa184d
Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7 am: 50f29d8ecf
am: bf4acfb71b

Change-Id: I8d4cb6a658f2e9d09b9904c722218ef594fb694a
api/current.txt
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl