tree 7fb40cb5f802430aa6065ccc1df38042734ed180
parent b97d792bdee1966da96e0c82a292bc0592f6e18b
parent dfa17b24b52463a0c92ef996214a5c136ce9d7ad
author Pat Tjin <pattjin@google.com> 1476408130 +0000
committer android-build-merger <android-build-merger@google.com> 1476408130 +0000

Merge "bullhead: move location/ to vendor" into nyc-mr1-dev am: f29de7cb50
am: dfa17b24b5

Change-Id: I45efa9351ab395b5d8952b215ba08d906dd7240d