OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Dec 2010 20:27:51 +0000 (12:27 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Dec 2010 20:27:51 +0000 (12:27 -0800)
commit2784eab7e87e6c71b16fcc7749c896d1cdff597d
tree6e90b764ea99d4c3d7bebf8e01e1ba075d9ceb2b
parent11e3b7e12f4cf65075899114e6a7251fec992371
parente9b709525d03726e5575af5b6194ef760fa21a6c
merge from open-source master

Change-Id: Icfea37187b764698744b97ebdaa74d56b4a38cdb