diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 18:13:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 18:13:52 +0000 |
| commit | 2f07a7059f4471963c114b0ab944249e8746cbf9 (patch) | |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13e850160d21008597239dc974c805df057d4e1b (diff) | |
| parent | 50d0afa43af2b215ddddbc7a3adfb8b5d85cb549 (diff) | |
am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '50d0afa43af2b215ddddbc7a3adfb8b5d85cb549':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions