diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-06 01:48:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-06 01:48:19 +0000 |
| commit | 0e6cce4fa0f02dec45044a90a6ac477cecddcf9f (patch) | |
| tree | fcf49524e8e0dbcb69aca7f9a975290fe91aa90f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6057df4f9e36765965fa787c0670ed6ac964138e (diff) | |
| parent | 5eaafa9d346a87505e80f97c7b090f9581bdd51f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2cae888d17 -s ours am: 66bd3dc20f -s ours am: 5eaafa9d34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12764397
Change-Id: I94eb54be75b323ac7fae9db64867298efb110f2b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions