| commit | 303bbe54caad6cd0c5adc8df6bf9393fde0db95a | [log] [tgz] |
|---|---|---|
| author | Keun Soo Yim <yim@google.com> | Wed Jan 24 19:20:48 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 24 19:20:48 2018 +0000 |
| tree | 9ac94135ddc17a347e5f5641a404f8bfe41f98e3 | |
| parent | 2c83ff102d7e64fbd7fc3b3577ec64e93fc2e9dc [diff] | |
| parent | 2f1ec9e2d0f5f70c7713b43e48a6aae2040d3385 [diff] |
Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev am: c85833780f -s ours am: 59e97b05f0 -s ours am: 2f1ec9e2d0 Change-Id: Ic9cb92aec69f9e07229cc9faefd845476a660379