| commit | 093062301f3d1a3b408403128faad0bd0653eccb | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 22:28:43 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 22:28:43 2017 +0000 |
| tree | 734e78e571f79a4b3601edef23079efc015fd1ae | |
| parent | eba0aa4123737b08ec281a18f5d01511fc2ba9dc [diff] | |
| parent | 4a92d6fece1ef963c75bd5ab7046bd2ac128ae87 [diff] |
Merge "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"