diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-28 02:26:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 02:26:41 +0000 |
commit | 085284738a933fd46c7bcd45221950ba781276c2 (patch) | |
tree | 8afe33f12751dfd46da9dd755eabfac55f5f6bea /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ff74137a7d8c1cd4b477341d47670851561a4f6a (diff) | |
parent | f9ee59b12a04acdefd53134f4a18e67bea6d4cfb (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f1147216ac -s ours am: f9ee59b12a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12244065
Change-Id: Ib500b994a795da4ded0ac6b0f70a84265f5ffa10
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions