tree a8ead98110ca0d48fa793f47bf693a064d9d399c
parent 7d89e1ce07c2c443dfb5ba576788c0d99c4dd4e2
parent bc2406e64c9bc046e1d7e971f41c5a350194eb42
author Benoit Goby <benoit@android.com> 1347486654 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347486655 -0700

Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev