OSDN Git Service

am 2bd58150: (-s ours) Merge 440fea from master. do not merge.
authorXavier Ducrohet <xav@android.com>
Thu, 29 Sep 2011 18:42:10 +0000 (11:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Sep 2011 18:42:10 +0000 (11:42 -0700)
* commit '2bd58150cdac3603552241fe70a73388e7094670':
  Merge 440fea from master. do not merge.


Trivial merge