OSDN Git Service

merged development with conflicts....
authorXavier Ducrohet <xav@android.com>
Fri, 1 May 2009 00:35:21 +0000 (17:35 -0700)
committerXavier Ducrohet <xav@android.com>
Fri, 1 May 2009 00:35:21 +0000 (17:35 -0700)

Trivial merge