OSDN Git Service

Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPT...
authorJeff Sharkey <jsharkey@google.com>
Mon, 1 May 2017 16:11:00 +0000 (16:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 16:11:00 +0000 (16:11 +0000)
commitf89879a1331a213855decb25a627c7c1ad4d31ee
treed17f85e94f42c04eb545be9aee50825a15c93ef2
parenta70ba223b3678183411ea2e6d01c2d2e6d0a2170
parent080e16575a5a97aa94498f6dd544d6cbd66faed8
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

Change-Id: I8e81a2f5361d2fc6ab61cb38f69fe1e0eb867e63
api/current.txt
api/system-current.txt
api/test-current.txt
core/res/AndroidManifest.xml
telephony/java/com/android/internal/telephony/TelephonyIntents.java