diff options
author | Tsu Chiang Chuang <tsu@google.com> | 2012-03-01 17:10:23 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 17:10:23 -0800 |
commit | 6053b195bcd49676b46b2257f6e1da04d0b4d9a5 (patch) | |
tree | 93ab4a2fffb1013b8d48cab6634ff8dbb567cb35 /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 37f9360a21985b2627d7069160d2950edf31c021 (diff) | |
parent | bb69bde593bc0ba58c744b19c43619d4eb0866b7 (diff) |
am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
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