tree 827804565049317dbbf64957c1a007848311d12d
parent eb48dce6073cdc9f2e70a1ce5bc8ee2a34e765b8
parent dcdf81788f624740f4e77270c4aadf2cbef25d4f
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