diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-31 02:45:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 02:45:21 +0000 |
| commit | 44718c4b8b3c7655ecc34981c8ee41e1daf34f00 (patch) | |
| tree | 701ff6554de0c25f6948630bc86d436357434321 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0278f2bf2d627af718a7540f8c6aaa8a359caae6 (diff) | |
| parent | bbb47d88d5f129ab1ca30d6a7a41976e47681e37 (diff) | |
am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'bbb47d88d5f129ab1ca30d6a7a41976e47681e37':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions