diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 20:51:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 20:51:37 +0000 |
| commit | 611d0218b854140e4d573eeb474572ebae4f834f (patch) | |
| tree | 8b5498e2aff84374eaf12728f90eaf66de137350 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4d0279405465cc7c88d66128b6dcb33409551a31 (diff) | |
| parent | f1f7cca29da9ba706e248277d419edbacd573581 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 93e19bed18 -s ours am: 84a1f72911 -s ours" into rvc-d1-dev-plus-aosp am: cf30bb36a6 -s ours am: f1f7cca29d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11758233
Change-Id: I52b506f3d184be0d983250e0eff4f9a35640380c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions