OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 16:27:19 +0000 (09:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 16:27:19 +0000 (09:27 -0700)
commitc043a97c9f3e1a2c8b5a95df70b89c711a1087ce
tree70e2742ac0c0d25af95f6cf23a915a51d7b01689
parent99096976d0ed8436c0eacdefae0ffb606bd573c5
parent0195941e06b365ea4bf7b41764934cf6ba65527e
merge from open-source master

Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87