diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-28 08:38:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-28 08:38:18 +0000 |
commit | 2369a51e1fdf510c05a8b5391831c5024ab33f94 (patch) | |
tree | 5772ace5ea5a6ed96b51a3a73eac907d45477c05 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d1548070ac88bdc03ec1547e9b836f17b320f6ba (diff) | |
parent | 0606b342e1f9e0b0e79cd289e4ad5af3a78a2d99 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bbb4606004 -s ours am: 0606b342e1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693343
Change-Id: I1b1590d75f26f195c1c542854f83c1cad6df6a22
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions