diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 14:23:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 14:23:15 -0800 |
| commit | 5b8c652cef8d05d25748486e6bc3cd1982baabac (patch) | |
| tree | e6d1d2d4af2209734e5c4dda9b118978e5166798 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 17bc7fabd56b2a50dbef372c228b6333147ea8a8 (diff) | |
| parent | 05c18ae06fc57cbbfcecc6013f26e3f845cff6a5 (diff) | |
am 05c18ae0: (-s ours) am 13b204f8: (-s ours) am 48557d6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '05c18ae06fc57cbbfcecc6013f26e3f845cff6a5':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions