tree d1aee199a4b8eb0bf61282bc668dcbd56b2104d6
parent 089100ea5e12ce1982a42e04f8e2ea0ddb2403d9
parent 218798cd98251e7bced5b3a268bc7bc35d438945
author Kenny Root <kroot@google.com> 1421976281 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421976281 +0000

am 218798cd: Merge "Remove superfluous OpenSSL include paths."

* commit '218798cd98251e7bced5b3a268bc7bc35d438945':
  Remove superfluous OpenSSL include paths.