diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:43:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:43:21 +0000 |
| commit | 856a9f99d514c6adf55c9ecedde866582a03a84a (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3772e27cb6ec797a1b79f5f93bbd6b72163d3671 (diff) | |
| parent | e7575570d3fa62be5b789e4106901dc3bc26d1c6 (diff) | |
am e7575570: (-s ours) am ebaecc0c: (-s ours) am cc9b8ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'e7575570d3fa62be5b789e4106901dc3bc26d1c6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions