diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:30:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:30:55 +0000 |
| commit | 12d21f10c69171c7f7a4a25c7f8c1ff07eac03fa (patch) | |
| tree | a9fc73af3653bb3c5db78ef929feee32acef5592 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 320c9617ac8ab327d10eb11ecfa64a20f7b019af (diff) | |
| parent | faa4706fea2e0ef423c7cd6619dff6df2970c800 (diff) | |
am faa4706f: (-s ours) am 1fc614f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'faa4706fea2e0ef423c7cd6619dff6df2970c800':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions