commit | fe71108465783bbda294bca14ff4bcf6089d598a | [log] [tgz] |
---|---|---|
author | Christine Franks <christyfranks@google.com> | Thu Aug 10 05:47:01 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 05:47:01 2017 +0000 |
tree | 3d8f84a532c7abac3909f09359f7d44f82822259 | |
parent | a6a33976a3ae08e4b6bb22057591784f14ba45c5 [diff] | |
parent | 2189999c61fa9d4d2fde47ea75f8dbae72ffb7e1 [diff] |
Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 2189999c61 Change-Id: I6736c0d8ed37fb8b4b1f49a93062aa181aba69b0