| commit | f35b35df6e5690577a9fbdb8a94903ad65a14a29 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue May 14 18:29:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 14 18:29:22 2013 -0700 |
| tree | 94a62e7c872d84ab059d32378f6075159b70bfe2 | |
| parent | 08405ee6adc7b89f7bae76ae9761dd1f2a4c9e95 [diff] | |
| parent | cdc457bbba0afae2f0bc1b1df7ba596da3a48676 [diff] |
am cdc457bb: Merge "Tracking change to add AEAD functionality" * commit 'cdc457bbba0afae2f0bc1b1df7ba596da3a48676': Tracking change to add AEAD functionality