| commit | bb1bc69bfe76b28ef82f957761842786ff73e340 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 16:55:46 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 16:55:46 2017 +0000 |
| tree | a03efdbe2e8b2fcb7e583be1dd173f27a4d68c86 | |
| parent | b0c874c9fb1ee7676beb8b605537d3ff394432f5 [diff] | |
| parent | 54da4e8f95a240d36d4812f540d9ceea7fc8c5fd [diff] |
Merge "Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef" into oc-dr1-dev-plus-aosp am: f79a7cddff"