tree cca317174da8d4d3d536f1f7ca26351a4e6442ff
parent 2092728a89fc8ebe0d467375038f370575794ca2
parent b87d707b96e6af9dabd23481b5c7a51160630831
author Shawn Willden <swillden@google.com> 1450741689 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1450741689 +0000

Merge "Set SoftKeymasterDevice flags correctly."