diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-27 22:26:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 22:26:38 +0000 |
| commit | b5853c74531cac635cb888185129093a8dee7b1a (patch) | |
| tree | 16dca674c5e87a35f9687d337f16ee92bfade1cf /rs/java/android/renderscript/ProgramStore.java | |
| parent | 433ee012363e86d9e2111684989b862bc952150f (diff) | |
| parent | 7e90512771943c2b87d96bba8a90e80eb26c65a7 (diff) | |
am 7e905127: (-s ours) am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '7e90512771943c2b87d96bba8a90e80eb26c65a7':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions