diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-05 20:19:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 20:19:37 +0000 |
| commit | cf6821a94227d665ba8dfd62ee7caad5bd07beaa (patch) | |
| tree | 73ab0fc5f28db45a8041fdd29e5a4dc4fddfaaf3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b69f1f0b6ceb69c2af873309c1f1bcf1c0dc8ed5 (diff) | |
| parent | 135a5761857f9dbd31ab51abe6466e26ddb379cd (diff) | |
am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '135a5761857f9dbd31ab51abe6466e26ddb379cd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions