diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 13:57:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 13:57:18 +0000 |
commit | aaba5d9d428c9919f3b94e3d4070175461cf91a3 (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramStore.java | |
parent | 1c7f26b45d1af6862abbd8e7ba4691d952c4ae66 (diff) | |
parent | 225a3b600f0b14e560158b54ea1401928e0181e4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b983b9dfc3 -s ours am: 37a4aeaadf -s ours am: b7e4b84c3e -s ours am: 225a3b600f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419719
Change-Id: Iafe98f469fad9babbe008d90fc9326a9b7f92ffb
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions