app_Settings

Go to file

Shishir Agrawal d2b0fc066c Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0

2016-01-26 13:48:21 -08:00

res

Merge "Show app level settings when app doesn't use topics."

2016-01-26 21:21:05 +00:00

src/com/android/settings

Unhiding MSIM APIs.

2016-01-26 13:48:21 -08:00

tests

Merge "Add SmallTest annotation to UserCredentialsTest"

2016-01-26 09:30:49 +00:00

Android.mk

resolve merge conflicts of bdc6074276 to master.