OSDN Git Service

am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not...
authorXavier Ducrohet <xav@android.com>
Wed, 29 Jun 2011 01:56:17 +0000 (18:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jun 2011 01:56:17 +0000 (18:56 -0700)
commit81877d0fdad84fae9d40bd027b1d9742d6a1b9ff
treefcf60e712c8ec063d65d20af892cd7fd3e822c75
parent80543fa0e9cb0bb65f0c1de8ee47ab0652178f60
parent691580c6bf001e7a87bf2f6ddc80342decbfa12a
am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
  CherryPick 988eeeb5 from hc-mr1. do not merge.