commit | a188bfaee7d55b56a9adfd84ad313f12f8f43103 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Tue Mar 05 05:49:45 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 05:49:45 2013 +0000 |
tree | 6d9742bd92769ff3760a727a8df440ba31e27af6 | |
parent | a533ee9d688cd54239da55fddfe1147c1523a989 [diff] | |
parent | 3eb34711cd8b2bdaf1fdbd0dafbcc3d469d338b6 [diff] |
am 3eb34711: am 8cf6ab7a: Merge "NativeCrypto: add OpenSSLBIOInputStream" * commit '3eb34711cd8b2bdaf1fdbd0dafbcc3d469d338b6': NativeCrypto: add OpenSSLBIOInputStream