OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Jul 2010 22:01:01 +0000 (15:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Jul 2010 22:01:01 +0000 (15:01 -0700)
commit1778b4b11effa15b3b540a5153f68127a9ec6adb
tree8272d0b4d618c3154739b785cd1d7d80a5ef4b6c
parentf47b0a1758a66277d11f362e307f0dd6c183051d
parentaf20a6081a6e8f84b43b99973974cd16e20760cd
merge from open-source master

Change-Id: I333595755ed96c753b3f01ef6715a230eee94e0d