diff options
| author | Baligh Uddin <baligh@google.com> | 2012-12-03 21:08:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-03 21:08:08 -0800 |
| commit | 4c5f46dfa8a417c8211ab3097a20464e11ed44b2 (patch) | |
| tree | 4d17c9fa60ac4c0de0592f92ea04241071d48283 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1616269a40e7013563c205ed08c46c2b3888c63d (diff) | |
| parent | 2306bec5851265146cecd4d5fdf02c930697a453 (diff) | |
am 2306bec5: (-s ours) am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '2306bec5851265146cecd4d5fdf02c930697a453':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions