commit | 5f9206ef3168a945039954ab8d5dc75862ead711 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Aug 10 05:49:16 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 10 05:49:16 2017 +0000 |
tree | 3d8f84a532c7abac3909f09359f7d44f82822259 | |
parent | c2fabb2f8e7109e20cc8ea446bcaca3f7397ec09 [diff] | |
parent | fe71108465783bbda294bca14ff4bcf6089d598a [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