OSDN Git Service

Merge "Changing the message on user switching dialog."
authorSuprabh Shukla <suprabh@google.com>
Mon, 23 Nov 2015 23:51:25 +0000 (23:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Nov 2015 23:51:25 +0000 (23:51 +0000)
commitedcfc1873a4f35c0e4e92fe4f13ff91f0141a779
treed3a6cf65e4960e23869e4deaa316507dd672750e
parentdf94885e470ccf30f13238b4c3c47bf2a9fd14d5
parent4fe508b6d3ceb3c72a79471d3a3a424ffeb71a0a
Merge "Changing the message on user switching dialog."
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/UserController.java