diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-15 13:59:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 13:59:08 +0000 |
| commit | 13eae7929f5defcbbb7342b6b09842e5c4f88bc2 (patch) | |
| tree | d40302ac3660b0c70cad2067b0364375deb42536 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b379fdd0e9fa560e0abfe771acf920bb6aca60ad (diff) | |
| parent | 26df364618da36007186df8eb4c7a85e47f8e18a (diff) | |
am 26df3646: (-s ours) am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '26df364618da36007186df8eb4c7a85e47f8e18a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions