diff options
author | Bill Yi <byi@google.com> | 2019-08-17 18:56:11 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-17 18:56:11 -0700 |
commit | f09d1c3a281c911dd319734a295214008070d9e4 (patch) | |
tree | 6e996c64764e91bdbd2ab557171e6f91893711d2 /rs/java/android/renderscript/ProgramStore.java | |
parent | 6f47e1284122adecfebfe8000b1740b88a799f0c (diff) | |
parent | ab5629ef3c38196d054ec391d4068c21ca9cd7e2 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: ab5629ef3c -s ours
am skip reason: subject contains skip directive
Change-Id: Ifca8c42c8d26580200deb2578becf7a73cb96d51
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions