OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 19:40:42 +0000 (12:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 19:40:42 +0000 (12:40 -0700)
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c


Trivial merge