OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:30:37 +0000 (07:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:30:37 +0000 (07:30 -0700)
Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921


Trivial merge