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