diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-07 03:41:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-07 03:41:50 +0000 |
| commit | 9f05b8921a27d4dc85e3e3a0ffcbee9e122b3e63 (patch) | |
| tree | 1e680a6d2745207da32f058c01fe29964436ee60 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 80d95e1cf82a69ecf0bde6ebdb6685465692d8ac (diff) | |
| parent | 646bdf8e89b8edbfe2096230bb0bae1980dac87f (diff) | |
[automerger skipped] Merge "Convert some users of Time.format() to an alt." am: 267b83e7d6 am: 1b0c2fcd3b am: 646bdf8e89 -s ours
am skip reason: Change-Id Ib142979858012bb766b4c107d41a21b0324de506 with SHA-1 9aa7b74a7a is in history
Change-Id: I06bea6151bff226fd4d7b52f1038f681b5b469a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions