commit | 44e57b181942b6f1fd296ffa856fbc78669b12bb | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu Oct 29 14:47:10 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 29 14:47:10 2009 -0700 |
tree | 1d3943ea90b72c58fc997123f41a996f15bb311f | |
parent | 79bc9c95d7f46858ba4631bfa072d37192099562 [diff] | |
parent | d52cfa564a387b755db5a18c55f93069bff7ef51 [diff] |
am 923f2cf0: am a89a059e: am 04104665: Merge change I911458a0 into eclair Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b' * commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b': Fix x offset for boxed textures