diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-24 18:54:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-24 18:54:02 +0000 |
| commit | c85833780f145e93a4cf246ed9566b4dfd5fbab3 (patch) | |
| tree | e274e78dd79a1f80666610a20d5cbf930e015469 /renderscript/1.0/default/Device.cpp | |
| parent | e4fb4e20e7412bb999477a9a70da13b424bda73b (diff) | |
| parent | 7d39f9ea827f0d885af1eef6e1e8f72bae05e477 (diff) | |
Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev
Diffstat (limited to 'renderscript/1.0/default/Device.cpp')
0 files changed, 0 insertions, 0 deletions