OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Apr 2010 20:31:56 +0000 (13:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Apr 2010 20:31:56 +0000 (13:31 -0700)
Change-Id: Id5e821e29b8d7ad1c1e103c8f219934bb0214eb8


Trivial merge