tree 9e215c78c5760a94b4e728caa328b37062a87af8
parent 68cf0f4df8032275a1b2baee878bc64e1c446577
parent 4f540fe8d03b415e25d11646ec7f6a776d8f5247
author Christine Franks <christyfranks@google.com> 1502331910 +0000
committer android-build-merger <android-build-merger@google.com> 1502331910 +0000

Merge "Don't lock down system user in demo mode" into oc-dr1-dev
am: 4f540fe8d0

Change-Id: I1d86ea5b69fe9a8bddb29d3e8483cc6a34b3b689