diff options
| author | Baligh Uddin <baligh@google.com> | 2013-06-03 14:18:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 14:18:25 -0700 |
| commit | d7a383238fbfdd983c120521c13405712ed76c2c (patch) | |
| tree | 0ad7f4e483f5bf48800e2452a3e3153ff5862e71 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 08afe497be60d2219e25155d9a21d288279a5eed (diff) | |
| parent | ba82b53dd7896fcc28af24f6625818a7d7afc5e4 (diff) | |
am ba82b53d: (-s ours) am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'ba82b53dd7896fcc28af24f6625818a7d7afc5e4':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions