OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Jun 2010 18:07:49 +0000 (11:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Jun 2010 18:08:36 +0000 (11:08 -0700)
commitdc544d216850fa9c5bf5af4c367a552b77b627c5
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parentdc9c0cb435bda53734eb352901ce4d16ed2d4999
parentec39747a769180da9be4e71b597fb538bcc9b800
merge from open-source master

Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471