diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-22 14:38:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-22 14:38:29 +0000 |
| commit | fef6f8a47e9940bf46be2d8f15b2f6d0abd31d22 (patch) | |
| tree | b7ab9339eccc09ffefb2f20cd5709d9f60d8d38e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05811a3bd2a26e48760558789faa0a01987f748b (diff) | |
| parent | f05f6309716e3b39c6d0999f72bcebcfe873a733 (diff) | |
am f05f6309: (-s ours) am 4d44f17c: (-s ours) am 3862452f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'f05f6309716e3b39c6d0999f72bcebcfe873a733':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions