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