OSDN Git Service

Merge changes from topics "128902411", "128645056"
authorXiangyu/Malcolm Chen <refuhoo@google.com>
Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)
commit764bf9cbeb3a179d137802065161195868c3e0e3
tree41df4e9758fd049e3ffff309d26c811dc065224c
parent6e7a60c85c42f0289e3c4d9813015e365b3122b8
parent32240b572b0291e067ecd3c699ee905cb19b3498
Merge changes from topics "128902411", "128645056"

* changes:
  API Feedback for CBRS
  Remove clearDefaultsForInactiveSubIds.
api/current.txt
telephony/java/android/telephony/SubscriptionManager.java
telephony/java/android/telephony/TelephonyManager.java