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

* commit '80b09638de3571d2c12aa3d6e3d22682fc431b72':
  Limit maximum number of concurrent keystore operations.
tree: 09226d46b8f1e19aaf507786048cbc0f5bf26c35
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE