tree 0df29c3a94b02db10614d82d4806095ad74e7035
parent 4f540fe8d03b415e25d11646ec7f6a776d8f5247
parent 9a18f5fa409d99e09bed57626d5a600142fd7009
author TreeHugger Robot <treehugger-gerrit@google.com> 1502342927 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502342927 +0000

Merge "Add settings and reset operations for demo users" into oc-dr1-dev