diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 23:01:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 23:01:37 +0000 |
| commit | f8ecdd0c72418e971a2e76dbddee3e84242ee4fb (patch) | |
| tree | b937df385a408d0709170f3f5b4252a38c22c96c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 92d5a67d1bc3daf48386a026d60bf30415695049 (diff) | |
| parent | 54de3ec25b309f51f4a05438fd0089d713cd5309 (diff) | |
am 54de3ec2: (-s ours) am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '54de3ec25b309f51f4a05438fd0089d713cd5309':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions