OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 15:10:10 +0000 (07:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 15:10:10 +0000 (07:10 -0800)
Change-Id: I7e8cece37a2acab21ba85d0370b1aef118fcf23c


Trivial merge