tree 93929ff2b706610679d1adacd4a2248efa240543
parent 9eeb28b6f15efbb65fe66e9366f8c8e548ded75f
author Wink Saville <wink@google.com> 1415735284 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1426010019 -0700

Update SubscriptionManager API as per API council.

bug: 17575308

Conflicts:
	api/current.txt
	services/core/java/com/android/server/location/GpsLocationProvider.java
	telephony/java/android/telephony/SubscriptionInfo.java
	telephony/java/android/telephony/SubscriptionManager.java

Change-Id: Ic97997613c08be737c24f98e66b92b21d83e9c81