diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 13:27:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 13:27:04 -0800 |
| commit | 411a26f2c42abcb533ad48ff6e6ff49a79e56dfd (patch) | |
| tree | 806c1d62abf844bf3758212737dfa300d193b335 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 883327d862e9383dee8b790c01c9c64fb96f65e7 (diff) | |
| parent | ed7d19e35cc4143af9e29bb09fc9f76ffe55c823 (diff) | |
am ed7d19e3: (-s ours) am 73b06973: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ed7d19e35cc4143af9e29bb09fc9f76ffe55c823':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions