diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-22 14:26:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-22 14:26:54 +0000 |
| commit | 05811a3bd2a26e48760558789faa0a01987f748b (patch) | |
| tree | b7ab9339eccc09ffefb2f20cd5709d9f60d8d38e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ec9e10b74d041a6b39c50f33677e571efe081614 (diff) | |
| parent | ce40ac7f0854609b0ef747c10b8b8c68f0655abd (diff) | |
am ce40ac7f: (-s ours) am 56c32d50: (-s ours) am 224083b8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ce40ac7f0854609b0ef747c10b8b8c68f0655abd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions