diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-05-23 02:40:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 02:40:42 +0000 |
| commit | 190ed5db4ac90612c1f6420f87ea462076fbe1a0 (patch) | |
| tree | 7ba5dcb21e6cf23d4141b96979f6701fd2b84aae /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8c0660c257d4cab61c37a03a64b7081f3095b9b5 (diff) | |
| parent | 2137d6a843b82996e08f0e03376e48860919d8bc (diff) | |
am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '2137d6a843b82996e08f0e03376e48860919d8bc':
Increase start timeout for wrapped process
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions