diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-07-28 17:48:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-28 17:48:41 +0000 |
| commit | 024f0f7fe3eee0db8d1770e76d023b7ff43ae4f3 (patch) | |
| tree | ad57d36da4a5377f3fe47f4cabf2b48648e04ce5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 56542a3e1c1ad616e7dd0ef3f11ad2468fb83e51 (diff) | |
| parent | 648d3030a7410c439fe6cf8475559cac2a605218 (diff) | |
Merge \"Fix timeout in a test utility method\" into nyc-mr1-dev
am: 648d3030a7
Change-Id: I0dc46ba4967e3094f9d08aa490a70ae94efa3263
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions