OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 00:34:38 +0000 (16:34 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 00:34:38 +0000 (16:34 -0800)
commit7322a484e73d84c8628e9d6ee1ca9da48c5f09c5
treea78ad07be384c92ec5d083bb786a227b6f29b639
parent4dd619fe68d0f9f33f8b89479837b6194adef74d
parenteaba36a626658068c94addcdfb1c8f88007e3009
merge from open-source master

Change-Id: I628573be1f8c407fcdae83e552ae456f5e953264