OSDN Git Service

Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell...
authorSudheer Shanka <sudheersai@google.com>
Sat, 14 Jan 2017 00:10:05 +0000 (00:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 14 Jan 2017 00:10:08 +0000 (00:10 +0000)
commitbdd0a2b14ab1da5c739c2658aa94f87daa9b3c04
tree83867c05f704851e4e0d7bf3d2c09b8a707c604e
parent659a650141d3dd904a5714458e3f94a10bf289cd
parentd91dd06591a761aa9e3eab519a23b40bf2b0dbcc
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
services/core/java/com/android/server/pm/UserManagerService.java