diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-13 13:11:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 13:11:53 -0800 |
| commit | 2218d330ad4bda30311d8552cc2140484d636678 (patch) | |
| tree | 80f2e08a1bed79982af02a1fd13a3dd176cccc22 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d0e2b18f55723ec2b045a28ad16b8edc07d27ad8 (diff) | |
| parent | 814b0b734772bfdbaa6b1888a253afc00c78bb58 (diff) | |
am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '814b0b734772bfdbaa6b1888a253afc00c78bb58':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions