OSDN Git Service

Merge commit '5db40c6db73db3f4433dd3456107efb4468a4a99' into manualmergeDroiddoc
authorDirk Dougherty <ddougherty@google.com>
Sat, 25 Jul 2009 03:31:36 +0000 (20:31 -0700)
committerDirk Dougherty <ddougherty@google.com>
Sat, 25 Jul 2009 03:31:36 +0000 (20:31 -0700)

Trivial merge