diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 22:45:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 22:45:21 +0000 |
commit | 2fc4d1bbeea6c6790366ade90783a200ec49d717 (patch) | |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d6028c0c3de537a3953eae81173d260814b5a366 (diff) | |
parent | 5ac66184e32a77409f676635a7fc6da2457db455 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fc2acf1d0b -s ours am: 5ac66184e3 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419993
Change-Id: Ib87f0f0488fbad29a0561ce4827e4696d99de881
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions