commit | ac1140f71690c537a0a318446731611341e163b8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jan 21 11:21:26 2010 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jan 21 11:21:26 2010 -0800 |
tree | ab1ad06d81ef122581a300f642f0de01a50d3086 | |
parent | da4092baa3ea8ec719f374f9567cc07cdfe48c55 [diff] | |
parent | ad981c191c42eebd92bdacc46b5334088a1efb1b [diff] |
merge from open-source master