diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 01:18:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 01:18:31 +0000 |
| commit | 3df8d0d16b46ae3e4c73d6b5d25118044746d36c (patch) | |
| tree | 6fee3fe821504564c1ce21e63aeaa4b25b2e6c78 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 455e36efe2fce8969c76d68c37445ff3ac7baa84 (diff) | |
| parent | 5718baad64135529db00da7aa57850e7a35e3718 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bb4b4bdc43 -s ours am: 5718baad64 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508890
Change-Id: I2c0cb3e6e3dd162e9dfb9b7a5ba984ed1b6c7f21
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions