diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-08-30 02:04:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-30 02:04:11 +0000 |
| commit | 4ace6263540c4d856c619431cd610745128b8f8d (patch) | |
| tree | c8ddb4aeecd9192dd06964a1aa5d3704cebcf500 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c3db6a332df8fd2838b52ebdc98442bfadc985b4 (diff) | |
| parent | 184ff7a1eebda8e8ddffcff63e5e352e480a020c (diff) | |
Merge "Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f am: 18f9533910 am: 40d926f4d4 am: 7b0db6bf48" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions