| commit | adae84f3a6ea5f17905a0e5be3f20173dfddd813 | [log] [tgz] |
|---|---|---|
| author | Daniel Nishi <dhnishi@google.com> | Thu Jul 06 22:22:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 22:22:37 2017 +0000 |
| tree | 734e78e571f79a4b3601edef23079efc015fd1ae | |
| parent | 1ab76fe4560ee750ef95a8b707137ccb6e3ae3b2 [diff] | |
| parent | 932f36050c65e7df1cf211ead3f57149fff357f2 [diff] |
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619 am: 932f36050c -s ours Change-Id: I7753c7042f79d98a36a01a56a832b62645143145