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