OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Oct 2010 18:20:13 +0000 (11:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Oct 2010 18:20:13 +0000 (11:20 -0700)
commit646d43e9a98a77b5f77adcbe62264a02ec3380ca
tree5675c4645b2445f4cb0222e0b076780d3a6b2d26
parentb8dcbd56fb2a3269de651f3aad7b161793bf11c5
parent69b73d4b186ad4074a746bafcc425512e050e385
merge from open-source master

Change-Id: I5db2a38f681d2168dfb801d6ad9a4a1243d3edba