tree fb157145789430f7d9d165f43d9414e34ac89cfb
parent 606724d7ad03ea75b3d0e145ca1302e773a7f1ca
parent 01e9b56154091ffc43727e1c5fe7e78b722fb26d
author Josh Gao <jmgao@google.com> 1471037966 +0000
committer android-build-merger <android-build-merger@google.com> 1471037966 +0000

Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f am: d7067c7fea
am: 01e9b56154

Change-Id: Ibb976fc8846afc9b39ef7bb5e5a535f8581aa28d