OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)
commit658e62322dc0cc9b66582351e87373b0712eb5c7
tree532df9facad6571445d85a65fb59ba0580ea5050
parentbd05a99fc7f3032289ceaf67919755cff196dfe3
parentf6de34a2c4f5effce0f048d885d96f161c3af6b1
merge from open-source master

Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010