tree a531773714027793b5a5d12c3ad97e0c3a18205d
parent 0cc248ee0105d1bddb0ab35c2ffa87732ff4641d
parent 5c3df3952099b15e139ec764980f65336fe23d8a
author Dan Willemsen <dwillemsen@google.com> 1492701059 +0000
committer android-build-merger <android-build-merger@google.com> 1492701059 +0000

Merge "DO NOT MERGE: Move camera headers to camera/include"
am: 5c3df39520  -s ours

Change-Id: If34530d184077d4110a0dc0bd6f046c16c3bc267