diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 06:45:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 06:45:23 +0000 |
commit | 307fb22f2d113924212129cc78313a260cd5cc21 (patch) | |
tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 /rs/java/android/renderscript/ProgramStore.java | |
parent | 02204628e5520e731552858ad6499eab7c3f0f84 (diff) | |
parent | 3a46197ad8afe7698d2f694dd4db952465f51b5f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f7cc355649 -s ours am: 3a46197ad8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516156
Change-Id: I1638730dba13cc424cc4776417287471c237f3c5
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions