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)
* commit '4d2b9bf341e7978225d6a305c2524ff79f2d18c5':
  Cherrypick 6de7bc61 from master. do not merge.


Trivial merge