tree a8ead98110ca0d48fa793f47bf693a064d9d399c
parent 164cc8f4664e962fd93126b99a2d108b172f547c
parent 063d0c5deefc1cda1027a9241dbaf338cac35be0
author Benoit Goby <benoit@android.com> 1347486763 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347486763 -0700

am 063d0c5d: Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev

* commit '063d0c5deefc1cda1027a9241dbaf338cac35be0':
  Add openssl to TINY_ANDROID build