OSDN Git Service

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


Trivial merge