OSDN Git Service

Merge branch 'master' into android-1.6
authorAtsuo Igarashi <atsuoigarashi@gmail.com>
Thu, 27 May 2010 06:37:17 +0000 (15:37 +0900)
committerAtsuo Igarashi <atsuoigarashi@gmail.com>
Thu, 27 May 2010 06:37:17 +0000 (15:37 +0900)
commit6929ad904f58ac81fc5fe6250a5bcd41d09b23bd
treef64801ce4fae0ebd9a7aac3bc1c6aa3d376a3ec4
parent6f07ee239b1d1f894e6f9c7a700918c45e0ff55b
parent834c0b21888319ad847576c1f0388ba8d60ff8c7
Merge branch 'master' into android-1.6