diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2012-02-13 13:42:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 13:42:45 -0800 |
| commit | eb56ad183af8a9833ff22a22b97f174f05266c58 (patch) | |
| tree | f328089bef1bc514293d13591773a076fce0ea74 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c1496d2d9a496e4aba817a58ecb9e07fe55cdba5 (diff) | |
| parent | 08eb7dd630a2de8dd51a988a747da26ff9d3f8fb (diff) | |
am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions