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