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