diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 19:36:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 19:36:32 +0000 |
commit | 056630f142a730fe852155033e84a107ddbef5c1 (patch) | |
tree | 53eaf704ed175a4da9eac011ea07ce3df572eb48 /rs/java/android/renderscript/ProgramStore.java | |
parent | 3ffdd7f27c9fb20ecd8fc7ee8d8b4d23acf9519a (diff) | |
parent | 41bcd3d2b17244c1a710a93aabad3ab8cad4db19 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f59fa9f9bb -s ours am: b89c6d94c5 -s ours am: c08dd11c22 -s ours am: 41bcd3d2b1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512963
Change-Id: Ie8017d39a3f7fd4cadf0ae7473b7e04fc56964c0
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions