OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Feb 2010 17:11:10 +0000 (09:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Feb 2010 17:11:10 +0000 (09:11 -0800)
commitb206c77531b7554b880292c88d895b5afb8dbfb7
treef4d901d22f470e7d421cde73033da6a191f7db17
parent6e03ece9c9bafb7ce8507b384d575e745403c24b
parent53342df09532380b78b150c1df15dae97670a002
merge from open-source master