diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-23 19:33:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-23 19:33:37 -0700 |
| commit | deaad328df2b155cdcc91dd45daaecf81fa6845c (patch) | |
| tree | bffe732b029a1838e529349dd83be6a5a4e6c997 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 81ee99f97b43336136d6b745179e20e502d83a96 (diff) | |
| parent | 1f067222c66e00de5bf2f74b69033359d918c9ff (diff) | |
am 1f067222: (-s ours) am ffbc7154: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1f067222c66e00de5bf2f74b69033359d918c9ff':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions