diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2012-03-01 17:12:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 17:12:55 -0800 |
| commit | 756fe38d0883966d143d81f38bb40a4b028ad463 (patch) | |
| tree | 865057aca0fddafe1c8e133a70250118bc38ee52 /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 7eed139cdf6d6bbec82adabb373fa3d87a3a0cea (diff) | |
| parent | 6053b195bcd49676b46b2257f6e1da04d0b4d9a5 (diff) | |
am 6053b195: am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '6053b195bcd49676b46b2257f6e1da04d0b4d9a5':
extend timeout to allow for more time for the device to connect.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions