tree e11c57205f80dea72022116001946db6083ed5c9
parent 9cb78cc3e1207544c6839ff3f78d266ae408a84b
parent d0f3e8588a58e1687ca4336609e809351e94e2d8
author Ying Wang <wangying@google.com> 1363967971 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363967971 +0000

am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev

* commit 'd0f3e8588a58e1687ca4336609e809351e94e2d8':
  android_filesystem_config: add /vendor