diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-14 17:53:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 17:53:33 +0000 |
| commit | 9cd1e9da9c64e8d9fe99497153ce319c05c12e52 (patch) | |
| tree | a0caad18b202db502ef9a617a01bce3f54ab8305 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c9519fcd386a43d3908111c468903329b9346a3d (diff) | |
| parent | 40716d95ad377a76f14a89b90319e4e9650b5963 (diff) | |
am 40716d95: (-s ours) am 63492522: (-s ours) am 46bfaa1b: (-s ours) am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '40716d95ad377a76f14a89b90319e4e9650b5963':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions