diff options
| author | Eric Rowe <erowe@google.com> | 2010-10-22 18:21:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-22 18:21:09 -0700 |
| commit | 288f13730e6535fb36581781196a55a6f2d198d6 (patch) | |
| tree | 009a95e38308dbd15231d7aa5ed5a1c7d939465c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59 (diff) | |
| parent | 8de43ab5ba818b9552326d5383729b3e6fbf7c82 (diff) | |
am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
Merge commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82' into gingerbread-plus-aosp
* commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82':
Change disable timeout for BT disable stress test
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions