OSDN Git Service

Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7
authorJordan Liu <jminjie@google.com>
Fri, 6 Jul 2018 19:15:49 +0000 (12:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 19:15:49 +0000 (12:15 -0700)
commitbf4acfb71bd075fca1a9dde699832d2463fa184d
tree553579c7e9532f5863f031795024971d4d89caf0
parentf53c7a2ae5d2ef0a36d3021305328c78fc75d44d
parent50f29d8ecf5122521304a8c3149b5053d3953a03
Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7
am: 50f29d8ecf

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