OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:50 +0000 (15:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:50 +0000 (15:55 -0700)
commit2399130ccdf8d4df2e647b29e98fc093118c7239
tree5fc31a2c6366ecddb2f636b980593b55f6236c2a
parent1efadda3c5dde7604a9bee7a5c508d14d51a00a0
parentd763b15adef76986ef2a54d008ca2299b55f9185
merge from open-source master

Change-Id: Iff03217fcd4e889d96b428079eb2a6bb5b48d9dd