OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 21:34:52 +0000 (14:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 21:34:52 +0000 (14:34 -0700)
Change-Id: I04fcaf990b9d0db7235ef34c3be717437bf96e19


Trivial merge