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