diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 14:23:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 14:23:07 -0800 |
| commit | 0181bd9529bab5b939c0058e099766d2896f95fd (patch) | |
| tree | e6d1d2d4af2209734e5c4dda9b118978e5166798 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f67ef23c327b8f4dbc81afeae2c0f7b5e7ccc198 (diff) | |
| parent | 6574caab31861726a2ac2ac19575d0ed0514b5d3 (diff) | |
am 6574caab: (-s ours) am cfc26fae: (-s ours) am 17e8f437: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '6574caab31861726a2ac2ac19575d0ed0514b5d3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions