OSDN Git Service

Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Thu, 6 Jul 2017 16:24:43 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 16:24:43 +0000 (16:24 +0000)
commit7ba5f8e2ec4b15be2c99e4406993a57291d25efc
tree04466595dee4f5c1758f3e4baa25ac21a48743f5
parent5b0a2266bfb8f2f9a3dcb91486fd1ec88cf583d3
parent9731c8bfef7c1520b8aaa999ef7d81caeabacf00
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
am: 9731c8bfef

Change-Id: I3fff6c1d14b6611a8e2700bc5b6cafcbd2420fa0