diff options
| author | Eric Fischer <enf@google.com> | 2011-05-11 13:08:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-11 13:08:50 -0700 |
| commit | 989523fd44b7dc10deedc926d908ec2c9f035aa7 (patch) | |
| tree | f0e900d3d2671d56e8003a8324f087737265d536 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | d21ab0e151292738d61f0d05fd8289f647fb9e1b (diff) | |
| parent | ca43ef6bc7ea52efb17718017e1f883e33504c05 (diff) | |
am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'ca43ef6bc7ea52efb17718017e1f883e33504c05':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions