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)
commit3c9f052b58b1a6356ae507ff5eb0591a25f81d70
tree322516e78af2d409d1cf560c5eaa2d18419b8e21
parent39988c62084fc8c55055a3879918ff8e3359ca1c
parent679c1a8d2dbe93510fe558ca8e63d61d57a076e5
merged development with conflicts....