OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 13 Nov 2010 00:42:12 +0000 (16:42 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 13 Nov 2010 00:42:12 +0000 (16:42 -0800)
commit932546a527c93fccfae51ba5ea1f00b436843c12
tree5d1c5bbfee9f2bbe87835cc801c0bd1fcfc4c3d2
parentc83cbc93266aa4567fc31bd8b3da5f21e9f3dfcf
parentf8081dc750ceab06a102e3790e49e4f3a26109ae
merge from open-source master

Change-Id: I981a7751bb2546895eeee1cf6363e585dae495f1