diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-15 22:28:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:28:06 +0000 |
| commit | 76b8b1e663553ecf92d669c02747692233545584 (patch) | |
| tree | 0af2789724a2380fe5f0cf50b38970ed5e37f587 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70 (diff) | |
| parent | 78b6e6c742a7872ba23c3684c47ff714dbd80cf6 (diff) | |
am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '78b6e6c742a7872ba23c3684c47ff714dbd80cf6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions