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