diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2016-12-09 19:58:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-09 19:58:22 +0000 |
| commit | 8aa678b575cbcd3f3a77b44d4f6a43d2173c3ef4 (patch) | |
| tree | 3d28da95d2ac6ca1ecc13a9c903b114cb9a8302a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ac7775f28e556ace58f9abb5defe0561d63e68f9 (diff) | |
| parent | 2fe1990ba779ef3fdb77cc596ff9eefeaeef613d (diff) | |
Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions