Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d39f9ea authored by Keun Soo Yim's avatar Keun Soo Yim
Browse files

DO NOT MERGE Resolve merge conflict for 

VtsHalCameraProviderV2_4TargetTest.cpp

Merged-In: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
Merged-In: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
Merged-In: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
parent 5b21eaa6

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+2049 −1783

File changed.

Preview size limit exceeded, changes collapsed.