tree d995ebb519ad2c93c7f1deba799f30c46d6c4de8
parent 4880314c8c336e7e9effb79fa6a1e1950a8e0fa6
parent 0f7bacf295f1a0e1beb6f55504cbde08f920b771
author Dan Willemsen <dwillemsen@google.com> 1443477359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443477359 +0000

am 0f7bacf2: am 35edc538: Merge "Prepare to remove libhardware_legacy from global include dirs"

* commit '0f7bacf295f1a0e1beb6f55504cbde08f920b771':
  Prepare to remove libhardware_legacy from global include dirs