6714030083b1d8ec5b2df6dfef08034d0d30c2fe - platform/frameworks/base

commit	6714030083b1d8ec5b2df6dfef08034d0d30c2fe	[log] [tgz]
author	Jack Yu <jackyu@google.com>	Thu Dec 10 12:27:58 2015 -0800
committer	Jack Yu <jackyu@google.com>	Thu Dec 10 12:27:58 2015 -0800
tree	91d98898b3c707d8327a0f67814b917b8ebd8060
parent	8366fdd6a82b7887bb8227e7d209175c8a9dcb0c [diff]

merge from master

Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9

api/current.txt[diff]
api/system-current.txt[diff]
core/java/android/content/pm/UserInfo.java[diff]
core/java/android/os/IUserManager.aidl[diff]
core/java/android/os/UserHandle.java[diff]
core/java/android/os/UserManager.java[diff]
core/java/android/provider/Settings.java[diff]
core/java/com/android/internal/logging/MetricsLogger.java[diff]
core/java/com/android/internal/util/StateMachine.java[diff]
core/res/AndroidManifest.xml[diff]
core/res/res/values/config.xml[diff]
core/res/res/values/symbols.xml[diff]
services/core/java/com/android/server/location/GpsLocationProvider.java[diff]
services/core/java/com/android/server/pm/UserManagerService.java[diff]
services/core/java/com/android/server/updates/ApnDbInstallReceiver.java[Added - diff]
services/java/com/android/server/SystemServer.java[diff]
telecomm/java/android/telecom/Conference.java[diff]
telecomm/java/android/telecom/Connection.java[diff]
telecomm/java/android/telecom/ConnectionRequest.java[diff]
telecomm/java/android/telecom/ConnectionService.java[diff]
telephony/java/android/telephony/CarrierConfigManager.java[diff]
telephony/java/android/telephony/CellLocation.java[diff]
telephony/java/android/telephony/PhoneNumberUtils.java[diff]
telephony/java/android/telephony/ServiceState.java[diff]
telephony/java/android/telephony/SubscriptionManager.java[diff]
telephony/java/android/telephony/TelephonyManager.java[diff]
telephony/java/android/telephony/cdma/CdmaCellLocation.java[diff]
telephony/java/android/telephony/gsm/GsmCellLocation.java[diff]
telephony/java/com/android/internal/telephony/GsmAlphabet.java[diff]
telephony/java/com/android/internal/telephony/ITelephony.aidl[diff]
telephony/java/com/android/internal/telephony/PhoneConstants.java[diff]
telephony/java/com/android/internal/telephony/RILConstants.java[diff]

32 files changed

tree: 91d98898b3c707d8327a0f67814b917b8ebd8060