tree 512290d41563392ee4362b01a49953a477813815
parent 88534657543fb1760fadf9c856738aec9e7e7203
parent 3024de2536aaa3a5ae517d9e0c430c9bd8b8c0ad
author Jason Monk <jmonk@google.com> 1498851770 +0000
committer android-build-merger <android-build-merger@google.com> 1498851770 +0000

Merge changes from topic 'HideMultiUser' into oc-dr1-dev
am: 3024de2536

Change-Id: I65d4d1f6cf04624188c30673013ece9bb61c94ec