OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Jul 2010 20:06:31 +0000 (13:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Jul 2010 20:06:31 +0000 (13:06 -0700)
Change-Id: I8c23f6f2bf984f794758ec27700d5fed4548ac09


Trivial merge