tree e08207d923a7a78b1c26fae71d049a5dbc61a168
parent b9554eedc782391eb5304c03a0bf8f01b0280499
parent e7444884c759b066c65e0be32a7e753c0c667709
author Shawn Willden <swillden@google.com> 1428701919 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428701919 +0000

am e7444884: Merge "Make several key crypto parameters repeatable."

* commit 'e7444884c759b066c65e0be32a7e753c0c667709':
  Make several key crypto parameters repeatable.