From: Shawn Willden <swillden@google.com>
Date: Mon, 2 Feb 2015 23:39:20 +0000 (+0000)
Subject: am f3391a93: Merge changes I4ef53a09,I7c3c5bd5
X-Git-Tag: android-x86-6.0-r1~62^2~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9da1cb51c6d9ddca81213211aa5168685557a9cc;p=android-x86%2Fhardware-libhardware.git

am f3391a93: Merge changes I4ef53a09,I7c3c5bd5

* commit 'f3391a93188de86f7e15859e613faba94f65cdbc':
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.
---

9da1cb51c6d9ddca81213211aa5168685557a9cc