diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2012-03-01 17:07:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 17:07:43 -0800 |
| commit | 673a66e357f49f939cf8e7f603ff14b8474c9032 (patch) | |
| tree | 9a13ffb1f00b977ce109e86be9cd885f9ee28bfa /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3c78e101ec3ad427bf0341e3134659346fa06cc0 (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/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions