| commit | 2f1ec9e2d0f5f70c7713b43e48a6aae2040d3385 | [log] [tgz] |
|---|---|---|
| author | Keun Soo Yim <yim@google.com> | Wed Jan 24 19:07:23 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 24 19:07:23 2018 +0000 |
| tree | 920a2c2d5fba1bf2e7122dce66abf854c72906f5 | |
| parent | 4502be6e8bb6f74574699f373d1102bc63654b64 [diff] | |
| parent | 59e97b05f060bb28948c249eff5b8b0e3a03348e [diff] |
Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev am: c85833780f -s ours am: 59e97b05f0 -s ours Change-Id: I25fa5a3d807bcb0395da9075bfacddbe6c0ac68d