OSDN Git Service

am f48c3ac3: am f7c63421: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 May 2010 18:13:00 +0000 (11:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 May 2010 18:13:00 +0000 (11:13 -0700)
commit63cac27739a3000b0778ff63accc58a0cc72548d
tree5bf9222cffbf575634b71e30c9f8e8687931e04d
parent68ed2f54ba2e7e204fdd7c908f465c5d6ddc66cf
parentf48c3ac39d0f63b8cf16b92d3543b888715b13de
am f48c3ac3: am f7c63421: merge from open-source master