tree 0947f6b19d153c3bcc322c6f43fb70801fe8886b
parent 80ca60d442f73d5e21c48cc1b58736daccfbbfb8
parent 34398ec8469361d280ecb61691a836a1ec941e65
author Chien-Yu Chen <cychen@google.com> 1506639872 +0000
committer android-build-merger <android-build-merger@google.com> 1506639872 +0000

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

Change-Id: I6563c72b273022639b9df0f1aafeea1f29a51460