commit | 3eb34711cd8b2bdaf1fdbd0dafbcc3d469d338b6 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Mon Mar 04 17:23:43 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 17:23:43 2013 -0800 |
tree | a9096e6b067ce8ad516b43b4dbac85dbaaec35fb | |
parent | f91a0d41f41e67ace17b71f190c2b0a21fec5d7f [diff] | |
parent | 8cf6ab7ad55c0fa631b51e0133914f7931e32b03 [diff] |
am 8cf6ab7a: Merge "NativeCrypto: add OpenSSLBIOInputStream" * commit '8cf6ab7ad55c0fa631b51e0133914f7931e32b03': NativeCrypto: add OpenSSLBIOInputStream