OSDN Git Service

Merge changes from topic "135105735" into qt-r1-dev
authorXiangyu/Malcolm Chen <refuhoo@google.com>
Fri, 12 Jul 2019 17:19:48 +0000 (17:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Jul 2019 17:19:48 +0000 (17:19 +0000)
commit896cdfa5470852a2d92c30d7f9a49c5d699740da
tree2ad53f00e1d181cbfedbf0ff9e25aafbdee2fe45
parent7d5da927402f9a998b62903edd4616a71bbb3d8b
parent07fcb5bb24b260206940363bb21350770000a831
Merge changes from topic "135105735" into qt-r1-dev

* changes:
  Use new API to get mergedSubscriberIds based on grouping.
  Provide @hide API to return merged IMSIs from grouping.
telephony/java/android/telephony/TelephonyManager.java