OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Sep 2010 02:21:01 +0000 (19:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Sep 2010 02:21:01 +0000 (19:21 -0700)
Change-Id: I70ad5eb8ea57d0a224cb5ed0cc3d4d65a7afc58a


Trivial merge