diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 16:51:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 16:51:36 +0000 |
commit | 3abbd4ef4f8fa5f2514f04886b762026702fc011 (patch) | |
tree | a187e807e41d3cd64432a941cba2261f6a47871a /rs/java/android/renderscript/ProgramStore.java | |
parent | b608da2a0c73f5d7677ffba9c393f6d9caa123f0 (diff) | |
parent | f5d7230dcafeb360e24eaddb07881b18538f1fcb (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a73565777d -s ours am: 30a3c80b8a -s ours am: 589cfeef0d -s ours am: f5d7230dca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759560
Change-Id: I00573b90b94837e8568504afd5d25f59ed354275
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions