diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:00 +0000 |
| commit | 5396a5ce3bd64d12a7b43ebe2e445f347a9ed318 (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 964bd52c6e52010704f7ad0a147fb5851761beb1 (diff) | |
| parent | 4ee4c516be6b4d6744f10bd45e5ad4c641f987f6 (diff) | |
am 4ee4c516: (-s ours) am 718928a1: (-s ours) am 2c93fcac: (-s ours) am efa098a7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4ee4c516be6b4d6744f10bd45e5ad4c641f987f6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions