| commit | 4b4f6e6ec5fcbaf7f67d011dd54d742223393922 | [log] [tgz] |
|---|---|---|
| author | Keun Soo Yim <yim@google.com> | Wed Jan 24 19:03:48 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 24 19:03:48 2018 +0000 |
| tree | 98509a6506f6a24088d794c19a5ab16d52ac2a73 | |
| parent | d37bd7afcd2ca227ced75fb524d3204c2f8bd2c8 [diff] | |
| parent | eebf378ccff6dd5cbdcf5e287aa8c025be9ee072 [diff] |
Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev am: c85833780f -s ours am: eebf378ccf Change-Id: I2b6020b39a5dc72ff5618c21dfa0659bc6c35e0d