OSDN Git Service

Merge "Add getProfileParentId (1/2)"
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 17 Nov 2017 01:40:05 +0000 (01:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Nov 2017 01:40:05 +0000 (01:40 +0000)
commitb6946d8563f7f1002ef597868ce2b27fe5b4ff66
tree4d56fa68812a9fb99ae2c3ff3de274b76bd72f08
parent171dec7468880ba545a9da2f187fe1dd7e7dca39
parent7a2c66359aff75ccdd2438ebedad87311c757f25
Merge "Add getProfileParentId (1/2)"
am: 7a2c66359a

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