commit | aa6f51811ebbe1acad688bfea59e1b153fc3904b | [log] [tgz] |
---|---|---|
author | Christine Franks <christyfranks@google.com> | Thu Aug 10 05:53:11 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 05:53:11 2017 +0000 |
tree | f5616a5cfc60db9bac95b25c5bc29dc5feb68d6f | |
parent | 47d8634cb76323e5f6d200800704093c1dec8b8b [diff] | |
parent | c2fabb2f8e7109e20cc8ea446bcaca3f7397ec09 [diff] |
Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 8121e6c162 am: c2fabb2f8e Change-Id: Ie286d80440bfdb0de87e4f34a45acfdc99998bda