OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 21:08:06 +0000 (13:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 21:08:06 +0000 (13:08 -0800)
commitc16c061d39750cbb27530d464a08c04595de386b
treee0bf3836c524092b9632b1e1b532cb57931564c0
parent93dbc0e00a44e783824e23f33b31e97f3a610681
parent7aa052149875bf58fe9ff3990e6e01140e983afe
merge from open-source master

Change-Id: I3bdc35f41c5b72e658cf8271edc0df8ffb1a479f