OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:28:32 +0000 (07:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:28:32 +0000 (07:28 -0700)
commit43abe820f2a46746dcd7b86db593c08b9e1f938d
tree67a0105873fe9c856b157ba192f1aee1279aac32
parent740c3e2e97a4cca24ecb534de72663ced238156a
parent38dcb296c95b7fd0ca597fca5a1fc904bfbbfa69
merge from open-source master

Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b