tree 0947f6b19d153c3bcc322c6f43fb70801fe8886b
parent 0b2434c1a517061903811bda6bbf35d2b8f90d6d
parent 61c204e1048a42c5a669ada0084a8107bd00b609
author Chien-Yu Chen <cychen@google.com> 1506639633 +0000
committer android-build-merger <android-build-merger@google.com> 1506639633 +0000

Merge "QCamera3HWI: Support multiple HDR+ outputs" into oc-mr1-dev
am: 61c204e104

Change-Id: Iaceca9ed46274fafc023327e4ccb1a3de6961497