OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 20:06:44 +0000 (12:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 20:06:44 +0000 (12:06 -0800)
commit6a1224f3274cfe3d59a9de29d6b134df878fe9d4
treee5d3d2df280947150f3d199286d26f56dfb80eac
parent462a5173575be47fcbf48d24df29afe5c20c1b9a
parent91feb2f8e7eeccddc60b89045ae25206224179ad
merge from open-source master

Change-Id: Ide21ec65f1912807b11d016579747f647aa90950