diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 15:52:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 15:52:38 +0000 |
| commit | 84d96222aea9aacfce5f903f1f9143f9e0aad03f (patch) | |
| tree | 85cbe79b747b3a166cc36cfa67da4727011f68c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 844cb3864462a04bfb5577c7cc093e70cbdada31 (diff) | |
| parent | 9d3bd1490a855362e9ae457c69a9415722dc561b (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 08919ffcf2 -s ours" into rvc-d1-dev-plus-aosp am: 9d3bd1490a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712622
Change-Id: Id1121a62c691c941dd6d953d48d9a5e88754a0a6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions