OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Feb 2010 17:56:49 +0000 (09:56 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Feb 2010 17:56:49 +0000 (09:56 -0800)
commit5a8b90117ee1cab36445b419e22c4dabac7faf98
tree845521c0d3c158b474499679de2a83fc9119ca9d
parent2e5401ff6a2fcd6978adf1d2895935a42e1990bf
parentd4963dc4347c871be5faa76920709001490e1d2a
merge from open-source master