OSDN Git Service

Merge "Add getProfileParentId (1/2)" am: 7a2c66359a am: b6946d8563
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 17 Nov 2017 01:58:04 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Nov 2017 01:58:04 +0000 (01:58 +0000)
am: 447e453e58

Change-Id: Idd087f45d5fba325f347a8bb0391745ccd0593a0

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