f0029c1ddb2875583e62c6a3f96d288e21f2efe2 - SHIFTPHONES/android_frameworks_base

commit	f0029c1ddb2875583e62c6a3f96d288e21f2efe2	[log] [tgz]
author	Nicolas Prevot <nprevot@google.com>	Thu Jun 25 14:25:41 2015 -0700
committer	Nicolas Prevot <nprevot@google.com>	Thu Jun 25 19:54:12 2015 -0700
tree	aaf784407eaab47af729b3e0e4686804c967c6dc
parent	5869363b06dc81b83cff7e75ffd48559938915fc [diff]

Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING

Also improve the javadoc.

BUG:21701782
Change-Id: I88a75ccfa71b0d5df2f4779987cf0fff56001fd3

api/current.txt[diff]
api/system-current.txt[diff]
core/java/android/os/UserManager.java[diff]
services/core/java/com/android/server/pm/PackageManagerService.java[diff]
services/core/java/com/android/server/pm/UserManagerService.java[diff]

5 files changed

tree: aaf784407eaab47af729b3e0e4686804c967c6dc