diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-04-24 14:16:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-24 14:16:57 -0700 |
| commit | 24c02dacc53fc49d1bfe9d74e0639d7ec070e36f (patch) | |
| tree | e23e46d854a8663a8c9d94f407be98033c8bfb82 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 20ced98ba2fc848f72305f4c10c838c9e3e94b1a (diff) | |
| parent | 14b37232455536b125dcdd847e7d1667e0e0651d (diff) | |
[automerger skipped] Merge "Delete unused timeout constant." into qt-dev am: f2e3c4f47d -s ours
am: 14b3723245 -s ours
am skip reason: change_id I5b4c8b42dea515f674ff10d64d0e1d06d849cca1 with SHA1 11aaadd6ae is in history
Change-Id: Iad97592f2ed87dc9f9beb92bd2cac66a57da77c7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions