OSDN Git Service

am 5d9df469: (-s ours) CherryPick 15fa2c from master. do not merge.
authorXavier Ducrohet <xav@android.com>
Fri, 23 Sep 2011 19:05:18 +0000 (12:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Sep 2011 19:05:18 +0000 (12:05 -0700)
* commit '5d9df469ba3662afefa78447c323cdfccb40b60b':
  CherryPick 15fa2c from master. do not merge.


Trivial merge