diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:16:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:16:32 +0000 |
| commit | e76c97da85aea3a93510eafff2491b4359dd6d65 (patch) | |
| tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 701716e2464c05e130d11f11b17797dd597c37d4 (diff) | |
| parent | fc32932d5037a2c1709df262fa587b959b20be16 (diff) | |
am fc32932d: (-s ours) am 57861323: (-s ours) am 27afa63a: (-s ours) am 396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'fc32932d5037a2c1709df262fa587b959b20be16':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions