diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 16:24:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 16:24:38 +0000 |
commit | 05ab7cc7118dabd0ad69d15de2524664ae5534ce (patch) | |
tree | 6131e1f8debab82b8594819d9cc7d4b238415633 /rs/java/android/renderscript/ProgramStore.java | |
parent | d6fee88939d25d4f59e9f8b3ab78821cac7306e1 (diff) | |
parent | 9c2d89b1232805f87a680efb26ace9222b5d3ad9 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54c37b2e14 -s ours am: 9c2d89b123 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759563
Change-Id: If3513960fd315b5db922eb1d79e4794c3ba5d72b
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions