diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 23:02:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 23:02:06 +0000 |
| commit | d87e57f6980847adeed04a6795e28b26ec4008e1 (patch) | |
| tree | b937df385a408d0709170f3f5b4252a38c22c96c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 983f053f461e1eaec44013ab4eba700548329594 (diff) | |
| parent | c87c6a2a4630e53d8dc07eb53095776fa31c463f (diff) | |
am c87c6a2a: (-s ours) am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c87c6a2a4630e53d8dc07eb53095776fa31c463f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions