diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-20 04:57:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-20 04:57:02 +0000 |
| commit | 48a86b15b4d629e860971283b0ecae8e78d8762d (patch) | |
| tree | 1337b754f1706811692826fb8f45d4104efbb6c3 /rs/java/android/renderscript/Script.java | |
| parent | 3c350e3ff55d61b32a09c8f1897e6997dc4ae0d9 (diff) | |
| parent | 0342ffa2a504deb9ad70713f591f1001ddeaabf4 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0342ffa2a5 -s ours
am skip reason: subject contains skip directive
Change-Id: I4fd364db6399649e7a96bfb6a25a584c02df9652
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions