tree e72b0011125fbf75a09160e9703ad279b5b25bad
parent c083f81cd03d95469a28d189433abfca9dd17023
parent dc70defa05a3a5e7b91e8e8b8a2ce22db48455ef
author Adrian Roos <roosa@google.com> 1504636008 +0000
committer android-build-merger <android-build-merger@google.com> 1504636008 +0000

Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev am: b0d617a643
am: dc70defa05

Change-Id: I6477e57f61eb3b80795b8eed273d3a123b382699