| commit | 4a92d6fece1ef963c75bd5ab7046bd2ac128ae87 | [log] [tgz] |
|---|---|---|
| author | Daniel Nishi <dhnishi@google.com> | Thu Jul 06 22:26:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 22:26:57 2017 +0000 |
| tree | 734e78e571f79a4b3601edef23079efc015fd1ae | |
| parent | ec8ae2b409d5884e9c08f2c1416d659f8ce8615e [diff] | |
| parent | 0398a0d1bd5c9e8438f97b6eb37b7b9f111c28b1 [diff] |
Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619" into oc-dr1-dev-plus-aosp am: 0398a0d1bd -s ours Change-Id: Ie7dcdd583791b1828d09af35a33646e50b9cbc64