diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-23 02:07:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-23 02:07:54 +0000 |
| commit | ed8c4096192b247d431bde149518ef87ba7e331a (patch) | |
| tree | c93fd0ca340ee1bbce39493983d4c2af4d2cc0a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 44cbb9f2294184c28542300d2b3e3f0b1ff96178 (diff) | |
| parent | 71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b (diff) | |
am 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions