OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:38:55 +0000 (13:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:38:55 +0000 (13:38 -0700)
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03


Trivial merge