diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 17:50:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 17:50:59 +0000 |
commit | eb57d4f0843dc6815e88ca524dfb3c8b43d6ccde (patch) | |
tree | 7cd49368d5c807f0230d697672a27df038af1f0d /rs/java/android/renderscript/ProgramStore.java | |
parent | f812c75948c3b2d177be3d7e6c87e8ff9bdaed34 (diff) | |
parent | 24c7da72ea428bfe6e08ec9d4b81b9147b8f8338 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd326a21d4 -s ours am: 398c2db050 -s ours am: 24c7da72ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508892
Change-Id: I5e2257b952748ae31d1829952c0730506061fc35
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions