tree 2ccdc14de16146d86361d679d4780edaea319abc
parent 545d5c41f04ec591bd0f034434b6d65ffd4c4c9c
parent bef17542c7e0563c6004463b1ede18a404a17c89
author Narayan Kamath <narayan@google.com> 1420476206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420476206 +0000

am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."

* commit 'bef17542c7e0563c6004463b1ede18a404a17c89':
  Remove hardcoded ICU & OpenSSL include paths.