| commit | 92d96fe94f80febb3aa561fb7bc8fea6c4d97559 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue May 14 18:34:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 14 18:34:08 2013 -0700 |
| tree | 7e604d390ea7908e15c637dfb2d8fd789ee74b61 | |
| parent | cde9a461ebc128416cb128b478bf6a662a6442d2 [diff] | |
| parent | f35b35df6e5690577a9fbdb8a94903ad65a14a29 [diff] |
am f35b35df: am cdc457bb: Merge "Tracking change to add AEAD functionality" * commit 'f35b35df6e5690577a9fbdb8a94903ad65a14a29': Tracking change to add AEAD functionality