diff options
author | Xia Wang <xiaw@google.com> | 2013-01-14 18:01:34 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-14 18:01:34 -0800 |
commit | 151aa4583c2839a6a797ccf30fe1339979b1c1b7 (patch) | |
tree | d49d4589c230a88b9a76f38f03dbc3707f54f279 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 22a94cb03ad39c5256608e4954fe4e85179d9ed6 (diff) | |
parent | 2439c921fb531299730a8bb9bb9ba3c463b40b32 (diff) |
am 2439c921: (-s ours) am cfa979b2: am b88564d2: am 12798957: am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev
* commit '2439c921fb531299730a8bb9bb9ba3c463b40b32':
Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions