tree 73f67b6a91df159e5cf63c1a50683bec598e6ccf
parent 9636b49bd3907dbd3f9772af8eb20dc7bb0bf0db
parent cfd289cf036783de7346837540912b32728e7c30
author Chad Brubaker <cbrubaker@google.com> 1436530611 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436530611 +0000

am cfd289cf: Use wrapped keymaster0 device\'s value of KEYMASTER_SOFTWARE_ONLY

* commit 'cfd289cf036783de7346837540912b32728e7c30':
  Use wrapped keymaster0 device's value of KEYMASTER_SOFTWARE_ONLY