diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-06 13:46:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-06 13:46:19 -0800 |
| commit | 465e88eb008408d4e655ca7bdd9c2b3ac305e54b (patch) | |
| tree | 1637c8b8e542fab8027afcdea01f2f2958c35efe /graphics/java/android/renderscript/Program.java | |
| parent | 62f6e1d8833868d3a9b19299bf2c5a6b2d654f6f (diff) | |
| parent | 1ee2394edd4b90111f8174862c7c0f435e1a3634 (diff) | |
am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
Diffstat (limited to 'graphics/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions