OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:30:37 +0000 (07:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:30:37 +0000 (07:30 -0700)
commit032ae72e19d9a12fff483664b975392ef63f2fb7
tree4922fefb4f75c3517c2ac402cda70a3441ce4eda
parent43abe820f2a46746dcd7b86db593c08b9e1f938d
parentc34cbee5b2739e673c2ee5979cc8d6c534e5c7a3
merge from open-source master

Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921