OSDN Git Service

Merge "Card ID APIs are public"
authorJordan Liu <jminjie@google.com>
Tue, 29 Jan 2019 22:43:47 +0000 (22:43 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 29 Jan 2019 22:43:47 +0000 (22:43 +0000)
commitbd4a4dc8891ab10b84fbb2f09f0d481aa0e4a832
treee08e2739905d81d35f6a24aa73ada778e739561a
parentcf2e0699628fbd4e6f87582566df833997c5b2ab
parentd6c684fff43c76dfa9847a7540541e8778ae44ed
Merge "Card ID APIs are public"
api/current.txt
api/system-current.txt
telephony/java/android/telephony/SubscriptionInfo.java
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl