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