OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:26 +0000 (11:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:26 +0000 (11:21 -0800)
commitac1140f71690c537a0a318446731611341e163b8
treeab1ad06d81ef122581a300f642f0de01a50d3086
parentda4092baa3ea8ec719f374f9567cc07cdfe48c55
parentad981c191c42eebd92bdacc46b5334088a1efb1b
merge from open-source master