diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 16:52:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 16:52:12 +0000 |
commit | 8f71e3539d43bfc0fd646c3afe33122e724e4dee (patch) | |
tree | a187e807e41d3cd64432a941cba2261f6a47871a /rs/java/android/renderscript/ProgramStore.java | |
parent | 3abbd4ef4f8fa5f2514f04886b762026702fc011 (diff) | |
parent | 3888e996f4d4a67e41a1e8a1a27453b3c11d1aa0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 67df9cf5f9 -s ours am: 4f8f275265 -s ours am: 5be6521ec4 -s ours am: 3888e996f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759562
Change-Id: I9397e2e83ca12c741ed3de257d3a1978e007f146
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions