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