diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-15 23:24:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-15 23:24:23 +0000 |
| commit | 24d305b9100701b44b1f200c1478b3a7cce0ea6e (patch) | |
| tree | f9e28a892505eb8161b9786d7d5aa62320312142 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0499bb5de45cf5542db7ac42406cd856d3386f1f (diff) | |
| parent | 7b5d78f89092852d7f7b2c73d73e2b769ec6dd35 (diff) | |
am 7b5d78f8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '7b5d78f89092852d7f7b2c73d73e2b769ec6dd35':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions