OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Apr 2010 19:46:21 +0000 (12:46 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Apr 2010 19:46:21 +0000 (12:46 -0700)
Change-Id: I93512089253f00b3da1e31f8b5f4d6e72fae8dc4


Trivial merge