OSDN Git Service

merge from Android branch
authorKazuhiko Kobayashi <chototsu_moushinp@yahoo.co.jp>
Wed, 14 Sep 2011 19:19:30 +0000 (04:19 +0900)
committerKazuhiko Kobayashi <chototsu_moushinp@yahoo.co.jp>
Wed, 14 Sep 2011 19:19:30 +0000 (04:19 +0900)

Trivial merge