diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 17:59:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 17:59:45 +0000 |
| commit | e69b7b3474c356438fbd65e43438e72ebda0bacb (patch) | |
| tree | 2bfa2c18b11c19595086ee509e59012739aa4c09 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 55542ee6449bd580f61bc005726b5c87773fbe25 (diff) | |
| parent | 46a02249d7bde3fb88cc5312f88dab6d1690e20e (diff) | |
am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions