OSDN Git Service

am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do...
authorXavier Ducrohet <xav@android.com>
Mon, 23 May 2011 17:21:49 +0000 (10:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 May 2011 17:21:49 +0000 (10:21 -0700)
commit8d54f983ba0204062d775347e61f80b1d5992d7a
treecc49bbb8abf379490d8a487b9e8b36e43e5ecb3b
parent58f6c371d7c7b5d789622d86353bf9ef22a5ec28
parentfc445ebe8b45b75d935c83702410f882d6a587c1
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread

* commit '9d9a7466cd051748ba656acd39265099294c4153':
  Merge 2fae858d from Honeycomb-mr1. do not merge.