tree ec6944b48481a3c6fdef7c0e30cd8406b1812277
parent 794d663e4239893e8a32c06675d68af86343e097
parent 4f540fe8d03b415e25d11646ec7f6a776d8f5247
author Christine Franks <christyfranks@google.com> 1502331909 +0000
committer android-build-merger <android-build-merger@google.com> 1502331909 +0000

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

Change-Id: Ib4670a8e4685a9f9bd933ccba9878bd59ccb6059