diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:23 +0000 |
| commit | 4de8b6818996d155501edcdc930a1652925e14b0 (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bb732e968d6fd5c1b7c4c83509bd54a53d16923b (diff) | |
| parent | 2525bb26c12b38509694ea93c61be3c0fccde25c (diff) | |
am 2525bb26: (-s ours) am e82d2508: (-s ours) am 6df69ed3: (-s ours) am d7805ef7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2525bb26c12b38509694ea93c61be3c0fccde25c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions