diff options
| author | Tao Bao <tbao@google.com> | 2015-08-31 23:05:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 23:05:34 +0000 |
| commit | f86894cb9c34f32c2d6f533e1c188dc4046e602c (patch) | |
| tree | 919c6a49a5f553d553b897db493ec629f835eb44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 603cfdcea1e53f963b27d33bb1f0579a619cc9ca (diff) | |
| parent | a42870fcd6bbd15326fea45e156bd2462bf8a78a (diff) | |
am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit 'a42870fcd6bbd15326fea45e156bd2462bf8a78a':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions