OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 16:11:31 +0000 (09:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 16:11:31 +0000 (09:11 -0700)
commitd69ec09f471f9430b07da0ccf73ac6ab9a638073
tree028086af264a1d96a17a8623d823a1923ba12af9
parentdee7dcb4c31e582b18fd242dae7985f78de7095d
parent0edd269995eea5ff911ea7348d9ede84e998cc0b
merge from open-source master

Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226