OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 21:33:10 +0000 (14:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 21:33:10 +0000 (14:33 -0700)
commit04c8f5551de9a0c4d23a558677562f0d69561964
treee3bb3c4440703ef20f55b5c4257078b3909713b7
parent21200d8144af6c7324ade317a1593d811e930a38
parent990482f81796e26943bcb7d6c69c7f95ab56638d
merge from open-source master

Change-Id: I7fd0fd51666489afe7e4645d2ec4970acbb0b4a9