OSDN Git Service

am f3391a93: Merge changes I4ef53a09,I7c3c5bd5
authorShawn Willden <swillden@google.com>
Mon, 2 Feb 2015 23:39:20 +0000 (23:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Feb 2015 23:39:20 +0000 (23:39 +0000)
* commit 'f3391a93188de86f7e15859e613faba94f65cdbc':
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.


Trivial merge