summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy/java/com/android/server
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2015-06-22 23:18:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-22 23:18:32 +0000
commit3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca (patch)
treef4b3d72352beb8d8c8bc27ab68d7ed47a3bd5ae4 /services/devicepolicy/java/com/android/server
parent2928f184b9789dc1f9609945a6f102d9eeaee6da (diff)
parent9edbda18df025527e18614cf0c45d538a27af30f (diff)
downloadframeworks_base-3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca.zip
frameworks_base-3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca.tar.gz
frameworks_base-3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca.tar.bz2
Merge "Allow cross-profile app linking from work to personal." into mnc-dev
Diffstat (limited to 'services/devicepolicy/java/com/android/server')
0 files changed, 0 insertions, 0 deletions