OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:32 +0000 (11:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:32 +0000 (11:21 -0800)
commit6f024607366221de07121a6f7a83471d72f225b8
tree8f576167547291fdea94bea27bd265aafd608db3
parent01d49d700e55c3c32b8b1bc2c816be6cc76e6409
parentb964b7c43de690a3503f0011989112709c885048
merge from open-source master