OSDN Git Service

Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb am: 8d3a8b1327
authoryuanhao <yuanhao@xiaomi.com>
Thu, 19 Jan 2017 19:10:44 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 19:10:44 +0000 (19:10 +0000)
am: 1a34a41268

Change-Id: Ic3673491705af125a88f66460996911244184fc8

1  2 
services/core/java/com/android/server/pm/UserManagerService.java