tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 7f49c406a10f0d395cc380d432bb43b5f23c7268
parent bc1edd790c55919331381ac4073647e35f5b7e80
author The Android Open Source Project <initial-contribution@android.com> 1265386177 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1265386177 -0800

reconcile main tree with open-source eclair