diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-27 23:10:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 23:10:35 +0000 |
| commit | e136f5e26f238c6450cad467435cce2f3a75f1c3 (patch) | |
| tree | 289fb5e735d565ebfc1348b923786464c5c2e023 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9 (diff) | |
| parent | 0b7f300a5545dc3576e74f4702bcc6b5497348f1 (diff) | |
am 0b7f300a: (-s ours) am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '0b7f300a5545dc3576e74f4702bcc6b5497348f1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions