OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Mar 2010 17:57:04 +0000 (10:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Mar 2010 17:57:04 +0000 (10:57 -0700)
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130


Trivial merge