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)
commit70abb5122aefb7301937d78a556bcf5fff0b8f91
treeca6947e98326ab1e3badbceef555faebc04c5a0f
parent61650097edeff0cc154afaa0466e1034127fffa5
parent1a34a412688dbb5489a20c942a6bfa5996bf1e77
Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb am: 8d3a8b1327
am: 1a34a41268

Change-Id: Ic3673491705af125a88f66460996911244184fc8
services/core/java/com/android/server/pm/UserManagerService.java