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)
commit882bbe1489518cabb661e06f6e87a6561d9239df
tree1be97085931ebcf9008077fc5e3eb41d3ee76a91
parentda0696187b6927270a6b8a15785aaa328c3030bd
parent5db40c6db73db3f4433dd3456107efb4468a4a99
Merge commit '5db40c6db73db3f4433dd3456107efb4468a4a99' into manualmergeDroiddoc