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