OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 13 Oct 2010 22:26:59 +0000 (15:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 13 Oct 2010 22:26:59 +0000 (15:26 -0700)
Change-Id: Iebdc036d678de9aefd40050cb25ce09939e88913


Trivial merge