OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Dec 2010 19:40:20 +0000 (11:40 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Dec 2010 19:40:20 +0000 (11:40 -0800)
commit41a8bf6387869698ac65d1c124199f22310a5d23
tree4565fbdc7a1ca599789675725383b84671d0e04e
parent3dd6e1d911d68f977b9049dc04f617f3e39c0c8b
parent18284d7b4da35a990268f51cdab0abc3a8e6e061
merge from open-source master

Change-Id: I424244342deb1febc945e1f6d5dad2528d892e9c