OSDN Git Service

am 66b7b389: am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606
authorShawn Willden <swillden@google.com>
Wed, 18 Feb 2015 16:05:11 +0000 (16:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Feb 2015 16:05:11 +0000 (16:05 +0000)
commit301ef55a44ea9cf8fb1372fe416796a22fa2f7c5
tree36b4a9bee5e9e2ef7a5e7b260ab7dd97e5a4ee1e
parent32034b5582d8bd649be29d79caa0dac362336dc6
parent66b7b3899fdc76add9e728cebcde146b386210e0
am 66b7b389: am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606

* commit '66b7b3899fdc76add9e728cebcde146b386210e0':
  Added insecure (chunkless) AEAD option.
  Add additional param lists to update and finish.