| commit | a48cf1e61927c0beed805a4ceee66712005c4e24 | [log] [tgz] |
|---|---|---|
| author | Daniel Nishi <dhnishi@google.com> | Thu Jul 06 21:58:41 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 21:58:41 2017 +0000 |
| tree | db9abe2aacca85a8b0e7b29fcaa85f1029726ec6 | |
| parent | 457c58f912249f8ea2d80c45c60a5c5ba7485ce2 [diff] | |
| parent | fa1143658b7f9be1f9009b209e76663db7db75a2 [diff] |
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev