tree 9f27a80758ee9fb8ddb53080349677a4d946ef2b
parent 3a4ecc96d62605f43bc8dda8523681b1de3072e6
parent 675232ebcb3ffa6c15263f4a6be03b474fd56870
author Chien-Yu Chen <cychen@google.com> 1498775382 +0000
committer android-build-merger <android-build-merger@google.com> 1498775382 +0000

Merge "QCamera3: Update for HDR+ header changes" into oc-dr1-dev
am: 675232ebcb

Change-Id: I11688ccf0162ea919c016f5229aea917071d0dbd