OSDN Git Service

Merge "Card ID APIs are public" am: bd4a4dc889
authorJordan Liu <jminjie@google.com>
Tue, 29 Jan 2019 23:18:21 +0000 (15:18 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Jan 2019 23:18:21 +0000 (15:18 -0800)
commit316dc44a910cccfdb693d8e44118dc2bfb072c79
tree8e71730226a9795a965ac469f112f4994dc474a5
parent930efcaf19add36d443f60203a2ac804ee85e01e
parenta039e692a4ffb356db7c99e89ce50e479cfd688f
Merge "Card ID APIs are public" am: bd4a4dc889
am: a039e692a4

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