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