OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 22:36:40 +0000 (15:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 22:36:40 +0000 (15:36 -0700)
commit9831f9681d5a23953bfec88b5516299592ed568d
tree563b3fbc859b4d8dad91354bfb95f0bd671faeba
parentff641197fddc19abfde91330d5c2fdd439e675a7
parent75c387873705004edb5c9d1d1b10a2d550c3d92c
merge from open-source master

Change-Id: I3d83bcd8c99e2e91097bcff391a8bd574ac81344