diff options
author | Baligh Uddin <baligh@google.com> | 2014-09-29 20:49:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 20:49:01 +0000 |
commit | 3e7c3c397bfd0f20db6719222218b349c3552e4d (patch) | |
tree | f3f90285d503a02b3f347f0c461738020c033152 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d73040202084411199925419c6856406c8df10fe (diff) | |
parent | e98a55e87e76dad4d5356438dd0068b874c87bab (diff) |
am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'e98a55e87e76dad4d5356438dd0068b874c87bab':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions