| commit | 54da4e8f95a240d36d4812f540d9ceea7fc8c5fd | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Jul 06 16:54:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 16:54:32 2017 +0000 |
| tree | a03efdbe2e8b2fcb7e583be1dd173f27a4d68c86 | |
| parent | ac414948c1b29631aa21658e91929f03b8610938 [diff] | |
| parent | f79a7cddff5e238137c3b32ab6db418f7f08e2b6 [diff] |
Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef" into oc-dr1-dev-plus-aosp am: f79a7cddff Change-Id: I97f4019f72e99439a2ffe1518f04303f223a873b