tree b12fa45dc18f43812a6570065727922e96a96d44
parent 87efaabd800eb9fadfdbbacd23f8db8eea196df5
parent f7780c050efaf939d11a513ac7691250bdd95b40
author The Android Open Source Project <initial-contribution@android.com> 1265386173 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1265386173 -0800

reconcile main tree with open-source eclair