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