OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Oct 2010 21:03:28 +0000 (14:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Oct 2010 21:03:28 +0000 (14:03 -0700)
commitbc3776773c70d22fa1e85f215687ad16fad87b20
treeea68fb6bbe520f5f5ece7e3a7985ec90b2f8ead4
parent2c66f70c13519992c841e01f1ad8fded537400c8
parent55287d3eb7e50e603358e99f9db9e706620c2bcf
merge from open-source master

Change-Id: I91b0b184d15e059c6dc5c583540ee455b342a8dc