diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-20 17:45:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 17:45:15 +0000 |
| commit | 4dc07b4d890baf8d9548b52e58a00ddfaca08a15 (patch) | |
| tree | 21b83e1546333c8f775902ece2ef491055079dcc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c25f41917ee5cb7be00107743a799f1e533639b6 (diff) | |
| parent | e20593034560656de227b5c34026bd0340239a20 (diff) | |
am e2059303: (-s ours) am df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'e20593034560656de227b5c34026bd0340239a20':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions