tree c13c8f115dffd5d196a26e6207f0f0c794cc5c58
parent 224c60c337490e095d402e63961bdc8ae9ebd70c
parent 9464ca1b97ace55f97c44e3362033fd31de33495
author Elliott Hughes <enh@google.com> 1387584051 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387584051 +0000

am 9464ca1b: am b8559790: Merge "Remove a non-existent directory from the include path."

* commit '9464ca1b97ace55f97c44e3362033fd31de33495':
  Remove a non-existent directory from the include path.