tree 8a76c367f1542e091dacfb71fc484f4e45eb9223
parent e8dd3d5774057f923630005999fe3fb6616bd337
parent f2c15ec6d816e5b4e022a97fbb7b87840ef5eabc
author The Android Open Source Project <initial-contribution@android.com> 1265386175 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1265386175 -0800

reconcile main tree with open-source eclair