OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 23:38:55 +0000 (16:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 23:38:55 +0000 (16:38 -0700)
commitdc9952c11082fca4e8cbf4f7995f5eaff75472ef
tree0236c2e50b99c30623a96859197b5c024e13e71b
parent4664d3a5ff108e799b75123731c5610332497279
parent7e67b9023d75320615d8a1f8472b9d0d0171b6be
merge from open-source master

Change-Id: Ifaf1c541ccef33ec3870bf8ce1af84d0988ce2dd