diff options
| author | Baligh Uddin <baligh@google.com> | 2013-12-26 23:50:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-26 23:50:18 +0000 |
| commit | 7aa47b52702d5be6b1644f4a6fe406e02c0cf5b8 (patch) | |
| tree | cdf5365dcb27ee831323c80daa80d6e0225b14a3 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 1bc72efdef558f05164202df07a025983819d4ea (diff) | |
| parent | c3e5b034ca88360f98c1b60e48ab9640dbd271b9 (diff) | |
am c3e5b034: (-s ours) am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c3e5b034ca88360f98c1b60e48ab9640dbd271b9':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions