OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Jul 2010 19:17:17 +0000 (12:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Jul 2010 19:17:17 +0000 (12:17 -0700)
Change-Id: Ib65087940790a8d3b72d8d345a11e7c9c53896cd


Trivial merge