diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:02:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:02:10 +0000 |
| commit | c388d6ffe9c5d2bf04e9ad4a5762772b97f2367d (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 34597e4f6dcda220c22bf008dedafa902ca24904 (diff) | |
| parent | f080d8648251a72ca9f9e713f5cfef9ec3323785 (diff) | |
am f080d864: (-s ours) am f8434712: (-s ours) am 0367b1c1: (-s ours) am ec10f595: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'f080d8648251a72ca9f9e713f5cfef9ec3323785':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions