tree a6ec2f9f48eaf96f2d6250654dba17a5b7073a20
parent b3b23db9555e7005afde9acf1237a453b8644f0e
parent de9cda97a326d001953bfd00cec5ee698045874e
author Brian Carlstrom <bdc@google.com> 1390072001 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390072001 +0000

am 0c1079d1: am b49ff839: am e36e9363: Merge "Add missing include path for system/camera_vendor_tags.h based on HAL3 to fix hammerhead checkbuild"

* commit '0c1079d1c2a375c1def61a1c506fb9473c8fa432':
  Add missing include path for system/camera_vendor_tags.h based on HAL3 to fix hammerhead checkbuild