OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Jun 2010 15:50:03 +0000 (08:50 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Jun 2010 15:50:03 +0000 (08:50 -0700)
commitdc5045360b73de2f4ebba0e212b426e31e59ec06
tree73dbc2dd43810f65bee579524f2f30f24a90fd74
parented9d64aa98ec5c8654abf0e3decfc1706539170c
parent6152f97ae4af620ed3d63826b4a8062358e564f6
merge from open-source master

Change-Id: Ide06923b072534e0a21dcee54adbdbce92b71a8e