OSDN Git Service

am 4348dca9: (-s ours) Cherrypick 78c89f from master. do not merge.
authorXavier Ducrohet <xav@android.com>
Thu, 29 Sep 2011 18:42:09 +0000 (11:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Sep 2011 18:42:09 +0000 (11:42 -0700)
* commit '4348dca9124f42af3ac3a6372831fcab66e99c52':
  Cherrypick 78c89f from master. do not merge.


Trivial merge