diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 08:00:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 08:00:17 -0800 |
| commit | cfc26faeed96a10d9b93fab10cce0e9fc2fb25a1 (patch) | |
| tree | 858179056dcb0d807d989cc404b79109db91d542 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 79cfdb20be13e424089849a92c49516bfe785c90 (diff) | |
| parent | 17e8f4377cac0f168deabf5ea1dfb435394ac571 (diff) | |
am 17e8f437: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '17e8f4377cac0f168deabf5ea1dfb435394ac571':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions