| commit | ec8ae2b409d5884e9c08f2c1416d659f8ce8615e | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 22:23:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 22:23:42 2017 +0000 |
| tree | 734e78e571f79a4b3601edef23079efc015fd1ae | |
| parent | f5099cb2169e802fc8e6b34161e6b973cb6c0c09 [diff] | |
| parent | adae84f3a6ea5f17905a0e5be3f20173dfddd813 [diff] |
Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619 am: 932f36050c -s ours"