OSDN Git Service

am 41d3d5c1: (-s ours) CherryPick 2c8cce from master. do not merge.
authorXavier Ducrohet <xav@android.com>
Fri, 23 Sep 2011 19:05:19 +0000 (12:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Sep 2011 19:05:19 +0000 (12:05 -0700)
commit12747022d301eccacd35076ef186288d6d325848
tree46d61cac1e220b7e2b7dcd53efcf43fe9ca02b4e
parentd283131129b2f4ec7e80c6a1062c4d73e63ef741
parent41d3d5c11fec1b5a20fdb895fb32152f28af374b
am 41d3d5c1: (-s ours) CherryPick 2c8cce from  do not merge.

* commit '41d3d5c11fec1b5a20fdb895fb32152f28af374b':
  CherryPick 2c8cce from master. do not merge.