diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-06-08 05:48:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 05:48:21 +0000 |
| commit | b9fe492ddd5c54c1c0574f3c32596823a3e7085e (patch) | |
| tree | 9753d795ab53c69895fa192559d3b40077618aab /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 54a6869814d02a183c11d1bad2ab2f2d53d3f11c (diff) | |
| parent | b1a2cde4fdb6bac0281b8a0683ccfeba3d917325 (diff) | |
Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504
am: b1a2cde4fd
Change-Id: I9164bc0eac776ff7e8a61c227e4ad9db45663542
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions