OSDN Git Service

am 62cd5c97: (-s ours) am 61d9ffbf: Merge "Do not merge." into gingerbread
authorWei-Ta Chen <weita@google.com>
Thu, 13 Jan 2011 20:38:38 +0000 (12:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 20:38:38 +0000 (12:38 -0800)
commit2fab5a3a1a8a17bbfabd19feb9e1b352184d2f28
tree0f1364799787600afd95940bf753064f5b927da8
parent5dbe61d7d5259f884f48327214f697cc0963dba7
parent4f9c47d937194f545452186e45c298f1361e4869
am 62cd5c97: (-s ours) am 61d9ffbf: Merge "Do not merge." into gingerbread

* commit '62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf':
  Do not merge.