| commit | c2fabb2f8e7109e20cc8ea446bcaca3f7397ec09 | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Thu Aug 10 05:44:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 05:44:50 2017 +0000 |
| tree | 3d8f84a532c7abac3909f09359f7d44f82822259 | |
| parent | a6a33976a3ae08e4b6bb22057591784f14ba45c5 [diff] | |
| parent | 8121e6c162c9b9d8551a6471cc03ccbdb424b61c [diff] |
Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 8121e6c162 Change-Id: I13cb5be728812f1ca96c9516f5c1ffb3276303d2