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