diff options
| author | Etan Cohen <etancohen@google.com> | 2017-03-07 16:49:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-07 16:49:53 +0000 |
| commit | 645b48c8af7e2615177d71f92d82f580cc476351 (patch) | |
| tree | 850536e27beddd11315d0d0f65759b92264069bc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b96d428e40ad345e402673c9a98a59a91e48019c (diff) | |
| parent | 8328f27a87577581be640f80918fe4c6251ac881 (diff) | |
Merge "[CM] Allow timeout in request network"
am: 8328f27a87
Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions