| commit | 932f36050c65e7df1cf211ead3f57149fff357f2 | [log] [tgz] |
|---|---|---|
| author | Daniel Nishi <dhnishi@google.com> | Thu Jul 06 22:03:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 22:03:36 2017 +0000 |
| tree | 71dfec0b8c6d33c5101185fc23a624548c44e706 | |
| parent | 0a97a0e72d3f5f84e6ca9e2ca4d6c3ec7857cae2 [diff] | |
| parent | a48cf1e61927c0beed805a4ceee66712005c4e24 [diff] |
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619 Change-Id: I4a1531a293f5c3493db22f73bc5511a97e756f52