OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 May 2010 23:16:09 +0000 (16:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 May 2010 23:16:09 +0000 (16:16 -0700)
commitcf6ab741c2a50b61d6cf1b1617e7a908caece6dd
tree4cf013daa72d160c2277eafa6e18c3dc4df135ef
parentff1965e61f4cfe0f31598945d751be2f3aa4b7f3
parentddb6aab7f57d3c68941e39a2b49f18603f361218
merge from open-source master

Change-Id: I323b3e716af939a3307189e694f4cdb83b4eda80