OSDN Git Service

am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not...
authorXavier Ducrohet <xav@android.com>
Tue, 7 Jun 2011 22:09:39 +0000 (15:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 22:09:39 +0000 (15:09 -0700)
commit3eb9f8326e6d72be671bf0226965ca3231a25d7d
treeddc2c6aeb57081564399f9a69b6432033300967c
parente1d14a29ff9aa17923dc4e9406408cbc07a97c31
parent67f09cd090adae6365ca36546b0a517e51255876
am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread

* commit '67f09cd090adae6365ca36546b0a517e51255876':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.