tree 51c303f8c844b027302140a513a5366604a165ab
parent 0b4b864e4197b5b5b646c84fefa471ed3c2cb281
parent 6efa9351a257edc53ce07eb8c544ccf08efb64ae
author Alex Klyubin <klyubin@google.com> 1411167746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411167746 +0000

am 6efa9351: Merge "Don\'t use deprecated OpenSSL functions."

* commit '6efa9351a257edc53ce07eb8c544ccf08efb64ae':
  Don't use deprecated OpenSSL functions.