OSDN Git Service

Merge "Type Allocation Code & Manufacturer Code"
authorJordan Liu <jminjie@google.com>
Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)
commit50f29d8ecf5122521304a8c3149b5053d3953a03
tree30f6af91a1c884789d1428ff06f0376a1f4eff9f
parent3147288c3bf55f07a81096db1595b247ac4ee65f
parentff801e5fd719c9aa797edd14e13562727b0e1236
Merge "Type Allocation Code & Manufacturer Code"
am: ff801e5fd7

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