OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 02:03:49 +0000 (18:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 02:03:49 +0000 (18:03 -0800)
Change-Id: I253d1d2406972755b0c3923d7b8880257130a5ad


Trivial merge