diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2019-04-05 06:21:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-05 06:21:06 -0700 |
| commit | 5b6e4b8901831dc75bbf20380b84de6e14482d64 (patch) | |
| tree | c8ea6b185c604259aea415187338eb0463a7f71e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 38326bd8095347ca42e453f2cf96fee9570ef079 (diff) | |
| parent | 5b3a0d18ae31413e61a0647860f093ab6fffaff6 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: Fix system_server watchdog timeout"
am: 5b3a0d18ae -s ours
am skip reason: subject contains skip directive
Change-Id: I15835d75c9a1af2d3875d626615dc3551407589f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions