diff options
| author | Jason Sams <jsams@google.com> | 2013-08-08 17:49:56 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2013-08-08 17:49:56 -0700 |
| commit | 5cb36d9b36617f6b0493602ef61d620dc8f7e0ae (patch) | |
| tree | 705918914816129a6608e28c1c96ee94e248107d /tests/cppbasic/compute.cpp | |
| parent | 32d93696ac61c7ca9f63756879dcd07a7f4165bd (diff) | |
| parent | b10a68c39dfa88face28995ec29942827f6a49bd (diff) | |
Merge commit 'b10a68c3' into manualmerge
Conflicts:
cpu_ref/rsCpuIntrinsicColorMatrix.cpp
Change-Id: Ibc2f1514f8858d99f08380f698bc9ae533c69212
Diffstat (limited to 'tests/cppbasic/compute.cpp')
0 files changed, 0 insertions, 0 deletions