OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 20:21:41 +0000 (12:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 20:21:41 +0000 (12:21 -0800)
commitfa0424d2cad8a059009330e403ce03591a3898e2
tree5315f0bf1508e154027a56de93110650cadd7e2f
parent31e5d48e2d775f5c3655bae4a36168f5d2daadd9
parent7aebcab2414437c477570804d602a8b163d964de
merge from open-source master

Change-Id: Ie021e68a089f09caf7fafc54fee5daa06fd271f5