diff options
| author | Keun Soo Yim <yim@google.com> | 2018-01-24 18:59:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-24 18:59:51 +0000 |
| commit | 59e97b05f060bb28948c249eff5b8b0e3a03348e (patch) | |
| tree | 920a2c2d5fba1bf2e7122dce66abf854c72906f5 /renderscript/1.0/default/Device.cpp | |
| parent | c6b7256ae73800798cc172f22f3dfb3de7ce6e10 (diff) | |
| parent | c85833780f145e93a4cf246ed9566b4dfd5fbab3 (diff) | |
Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev
am: c85833780f -s ours
Change-Id: Ib0d50b801ba91217df8cf13f64ea62dfbd785ecb
Diffstat (limited to 'renderscript/1.0/default/Device.cpp')
0 files changed, 0 insertions, 0 deletions