OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Sep 2010 01:01:23 +0000 (18:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Sep 2010 01:01:23 +0000 (18:01 -0700)
commit93e95227b505e605cae4431fee0929553ccf1834
tree07a190dc786add0cffe9ba7b718186e15e205e15
parenta6776b48f222b858b3dcedd5567b1f08bf645f8e
parent8987385f7ab95e6e92910cf18ed8bc40cb39252d
merge from open-source master

Change-Id: I01eb95ad2873643098d75d58f843c7aa26ed56b2