diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 23:01:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 23:01:39 +0000 |
| commit | 72781426604697516c5c726e01750d919da66da8 (patch) | |
| tree | b937df385a408d0709170f3f5b4252a38c22c96c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f8ecdd0c72418e971a2e76dbddee3e84242ee4fb (diff) | |
| parent | e9a5424cc64e44812383ab9e417f18b8a1f647d1 (diff) | |
am e9a5424c: (-s ours) am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'e9a5424cc64e44812383ab9e417f18b8a1f647d1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions