OSDN Git Service

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


Trivial merge