OSDN Git Service

am 4d2b9bf3: (-s ours) Cherrypick 6de7bc61 from master. do not merge.
authorXavier Ducrohet <xav@android.com>
Fri, 23 Sep 2011 06:39:44 +0000 (23:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Sep 2011 06:39:44 +0000 (23:39 -0700)
commit280cc6655812689a84584b1689555f6d50787a3c
tree0f0ba32f1bc72f10ddb1392ae7d3100f0effd558
parent6eb7db42634b24ff858892fa62a760edbc918655
parent4d2b9bf341e7978225d6a305c2524ff79f2d18c5
am 4d2b9bf3: (-s ours) Cherrypick 6de7bc61 from  do not merge.

* commit '4d2b9bf341e7978225d6a305c2524ff79f2d18c5':
  Cherrypick 6de7bc61 from master. do not merge.