OSDN Git Service

Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPT...
authorJeff Sharkey <jsharkey@google.com>
Mon, 1 May 2017 16:19:39 +0000 (16:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 16:19:39 +0000 (16:19 +0000)
commitea2710d27cc816e6d5d501b06e79def24d1f2a77
tree529441ee8d699b65da8e535aeb0fdec63969988a
parente4c86e4cb9fec7270edad4e2fdd0e86e00babecf
parentf89879a1331a213855decb25a627c7c1ad4d31ee
Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev am: 080e16575a
am: f89879a133

Change-Id: Iac4f73f0c20ce3b95d406d487a5ed2f8ed391033
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/content/Intent.java
core/res/AndroidManifest.xml