tree d995ebb519ad2c93c7f1deba799f30c46d6c4de8
parent eea5d8878d67298a81aaf0d85dd5c9f2f9742b83
parent 35edc53853877e6998e117357902579147f3e7e4
author Dan Willemsen <dwillemsen@google.com> 1443476951 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443476951 +0000

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

* commit '35edc53853877e6998e117357902579147f3e7e4':
  Prepare to remove libhardware_legacy from global include dirs