OSDN Git Service

am 7dabc550: am 93996364: Merge change 27102 into eclair
authorFred Quintana <fredq@google.com>
Sun, 27 Sep 2009 22:40:05 +0000 (15:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 27 Sep 2009 22:40:05 +0000 (15:40 -0700)
commit326cb9db61a592a7e79eb2b78fc633b434f64cb9
tree9cb298928d67939d8f0aa0e3d77c2c26c9b91a64
parentf107d74612c939eead4cf0b610742c7f6d9ad251
parent7dabc550c445a38526d7fe1d60d50b83ec24a875
am 7dabc550: am 93996364: Merge change 27102 into eclair

Merge commit '7dabc550c445a38526d7fe1d60d50b83ec24a875'

* commit '7dabc550c445a38526d7fe1d60d50b83ec24a875':
  - fix a crash that happens when reparenting a change