tree c6f851660f5466fe2a620df8754d5b81810f31c6
parent f3b6768601b466aa8d200a88e504a910b7e76981
parent 88710dead09434df19f872e5114f19e09680323c
author Christine Franks <christyfranks@google.com> 1502343480 +0000
committer android-build-merger <android-build-merger@google.com> 1502343480 +0000

Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am: 88710dead0

Change-Id: I7b3aae902eebd27590e4799408e941ee7761b834