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)
commit7f8e85905491b4dcaa1daa28e0c0020235417312
tree9b5930f31de72cc3ded37cedb74ad445ff32998c
parentc1fc8801e39dd3de4a160aa38ac0a6c97a00161a
parentbd733ec24d927d42f169f4024bd11756f13dc5eb
merge from open-source master

Change-Id: I611ccb2c4016db79dcfc6dcede7938706a7a4e82