Christine Franks d019d4c315 Merge "Support demo mode and demo users" into oc-dr1-dev am: 2f87ca1637 ...

am: b128d9cd77

Change-Id: I317aa17cefa918483aeec0cc58df89dd18f59472

2017-07-11 14:53:59 +00:00

..

java/com/android/server/devicepolicy

Merge "Support demo mode and demo users" into oc-dr1-dev am: 2f87ca1637

2017-07-11 14:53:59 +00:00

Android.mk

…