OSDN Git Service

am f1654c60: Merge "Add initial Keymaster 1.0 tests"
authorChad Brubaker <cbrubaker@google.com>
Fri, 13 Mar 2015 18:16:52 +0000 (18:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Mar 2015 18:16:52 +0000 (18:16 +0000)
* commit 'f1654c6015dbf30b7dae3575d787ca141ae84028':
  Add initial Keymaster 1.0 tests


Trivial merge