summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2009-10-29 14:02:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 14:02:38 -0700
commit923f2cf0dc15ac2bafa8013b31a722b85a64176b (patch)
tree144cbf7c1d97bc2778f06d2ab20b6350279b9918 /core
parentf545e798ebbe7e081c8e87ad32aa450388364bef (diff)
parenta89a059ea7f4cb3180feaa131eda4713974c3873 (diff)
downloadframeworks_base-923f2cf0dc15ac2bafa8013b31a722b85a64176b.zip
frameworks_base-923f2cf0dc15ac2bafa8013b31a722b85a64176b.tar.gz
frameworks_base-923f2cf0dc15ac2bafa8013b31a722b85a64176b.tar.bz2
am a89a059e: am 04104665: Merge change I911458a0 into eclair
Merge commit 'a89a059ea7f4cb3180feaa131eda4713974c3873' into eclair-mr2-plus-aosp * commit 'a89a059ea7f4cb3180feaa131eda4713974c3873': Fix x offset for boxed textures
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions