diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-07 15:07:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 15:07:46 +0000 |
| commit | 42fbf5a0da42c32325aef385b138d812667f0644 (patch) | |
| tree | e438ef22e0f062feac1b33fea870b1157860977c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c6cb7e9b1da2e92f4e75b109d03aff723b044a71 (diff) | |
| parent | 5e3cda67607b61479b6a8d2337e077ff6438c5df (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0609e2b01d -s ours am: 5e3cda6760 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12780797
Change-Id: I15cd6d7b494a60bb6c85c93d57947bb2a74a3ffb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions