OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 03:30:24 +0000 (19:30 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 03:30:24 +0000 (19:30 -0800)
commit462a5173575be47fcbf48d24df29afe5c20c1b9a
treec3493953b579b7bdb66f42c74806919f3f9788da
parentdbcedf1721f8c3bd740b319b76b1a2cec3059314
parent777bc7d7b77ac3c36680bb7cc63c8e835ad1cf85
merge from open-source master

Change-Id: Ia5db9ed687e683df73ec341158096726671a6752