OSDN Git Service

am 9c769215: (-s ours) CherryPick 67000f from master. do not merge.
authorXavier Ducrohet <xav@android.com>
Fri, 23 Sep 2011 19:58:36 +0000 (12:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Sep 2011 19:58:36 +0000 (12:58 -0700)
commit35596cf53e22c617630dee9ea820404f7baa0c84
tree3e19766ea52ef4bbb7b1abc84d182946542354aa
parent9e5846dbe5e55196e48f29b3208149e0a841802e
parent9c7692151010d9ae4d52b645c5a2e7fea3fe9dda
am 9c769215: (-s ours) CherryPick 67000f from  do not merge.

* commit '9c7692151010d9ae4d52b645c5a2e7fea3fe9dda':
  CherryPick 67000f from master. do not merge.