tree 09226d46b8f1e19aaf507786048cbc0f5bf26c35
parent e5f3a444f692f2d61d54783021551bb82c56e507
parent 108a5d34b5ce181dff52906a66862ec084841ec4
author Shawn Willden <swillden@google.com> 1448319325 +0000
committer android-build-merger <android-build-merger@google.com> 1448319325 +0000

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

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