OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Feb 2010 18:02:55 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Feb 2010 18:02:55 +0000 (10:02 -0800)
commit563d3a62f3762b312a4c0a9d9af15a2333beaede
treec47bd4d710aa1190edba067650002bef90d654c3
parent8978547f254b6b6ba2e322794aa044803f3edc2a
parent9a352305f86db9782e474dc09bcf3d09511abf56
merge from open-source master