tree 7c6d1f6f2ba6473d79d9a7a7d638cb18f60204e5
parent 448cb9f9ee8c6bd0a53662362f4a71a1fa4bbd5b
parent 99f4ac144506d307b38ab112d1054e5fe18a7217
author Shawn Willden <swillden@google.com> 1428703275 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428703275 +0000

am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable"

* commit '99f4ac144506d307b38ab112d1054e5fe18a7217':
  Make several key crypto parameters repeatable