OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 20:04:37 +0000 (12:04 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 20:04:37 +0000 (12:04 -0800)
Change-Id: I611ccb2c4016db79dcfc6dcede7938706a7a4e82


Trivial merge