tree bbb428d958c5d908c53239a56a30f72a519b8471
parent 8e76ddc9e27edf701ace1b5aa7899d34673729fb
parent 3ca1faebe33c6cf083b6c0e1060d62fea4c10a41
author The Android Open Source Project <initial-contribution@android.com> 1265386172 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1265386172 -0800

reconcile main tree with open-source eclair