OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 May 2010 22:16:56 +0000 (15:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 May 2010 22:16:56 +0000 (15:16 -0700)
commitf9e275b0c785aa8ed83606e5b98f37d2050a528e
tree877f7ce64f918e9f49256a1892945b96b05c7fcb
parentaed937ba46e4137ad5a5d047a438f48c4c81e46b
parentf9f1a9d764918cdf5bd6901771e46246a3d2362e
merge from open-source master

Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d