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)
Change-Id: Icfea37187b764698744b97ebdaa74d56b4a38cdb


Trivial merge