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