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