tree 378535026c9d6cc49a74629b720c996e9be69614
parent b35d08d14ebc181a9bf25faaf8fea0d4ba014ad6
parent b55798272ce720ff9c2c3b54f2ee90a0d2bc97cc
author Steven Moreland <smoreland@google.com> 1492057832 +0000
committer android-build-merger <android-build-merger@google.com> 1492057832 +0000

Merge "android.hardware.camera.common@1.0-helper: vendor" into oc-dev am: f8b85e63e4
am: b55798272c

Change-Id: I1b7ccb2ec310574d5e431e06afe7fcf57033ad39