commit | 33369d83b7446f0987ec3ba7a4659faf82e26308 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Mon Feb 11 11:23:25 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 11 11:23:25 2013 -0800 |
tree | 67aec392266b12082ace006f7297f336d5ffcf02 | |
parent | 6c6630479f3f2ea89edb83c7674baa8345694f1e [diff] | |
parent | b592e0854049cd931a0ffecd340f216dbef59ca8 [diff] |
am b592e085: Merge "openssl-1.0.1e upgrade" # Via Brian Carlstrom (1) and Gerrit Code Review (1) * commit 'b592e0854049cd931a0ffecd340f216dbef59ca8': openssl-1.0.1e upgrade