| commit | c33609cbee65273c6f8fd65c5329ed5f94837e3e | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Thu Aug 10 05:56:27 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 05:56:27 2017 +0000 |
| tree | f5616a5cfc60db9bac95b25c5bc29dc5feb68d6f | |
| parent | aa6f51811ebbe1acad688bfea59e1b153fc3904b [diff] | |
| parent | 5f9206ef3168a945039954ab8d5dc75862ead711 [diff] |
Merge "Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 2189999c61" into oc-mr1-dev-plus-aosp am: 5f9206ef31 Change-Id: Id06d08f01997d4be4ab64ce684cd3b11443b0eca