refs/heads/brillo-m8-dev - platform/system/security

commit: 80b09638de3571d2c12aa3d6e3d22682fc431b72
[log]
author: Shawn Willden <swillden@google.com>
Mon Nov 23 22:55:25 2015 +0000
committer: android-build-merger <android-build-merger@google.com>
Mon Nov 23 22:55:25 2015 +0000
tree: 09226d46b8f1e19aaf507786048cbc0f5bf26c35
parent: e5f3a444f692f2d61d54783021551bb82c56e507 [diff]
parent: 108a5d34b5ce181dff52906a66862ec084841ec4 [diff]

Merge "Limit maximum number of concurrent keystore operations."
am: 108a5d34b5

* commit '108a5d34b5ce181dff52906a66862ec084841ec4':
  Limit maximum number of concurrent keystore operations.

tree: 09226d46b8f1e19aaf507786048cbc0f5bf26c35

keystore/
keystore-engine/
softkeymaster/
MODULE_LICENSE_APACHE2
NOTICE