diff options
| author | Keun Soo Yim <yim@google.com> | 2018-01-23 17:56:43 -0800 |
|---|---|---|
| committer | Keun Soo Yim <yim@google.com> | 2018-01-23 17:56:43 -0800 |
| commit | 7d39f9ea827f0d885af1eef6e1e8f72bae05e477 (patch) | |
| tree | 9de6d0fe928665e1a65a22a136b70c4194d9c312 /renderscript/1.0/default/Device.cpp | |
| parent | 5b21eaa608485ba6f898c917919fcf7df5955fff (diff) | |
DO NOT MERGE Resolve merge conflict for
VtsHalCameraProviderV2_4TargetTest.cpp
Merged-In: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
Merged-In: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
Merged-In: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
Diffstat (limited to 'renderscript/1.0/default/Device.cpp')
0 files changed, 0 insertions, 0 deletions