tree 4e48493c6239cdd9b269fbe7a777a53b309843ce
parent 4c10be9fd6d06fe8cdd93d8966ffbb9942c87aad
parent e959e67336c2f9c490bcf053f13dbd613da95221
author The Android Open Source Project <initial-contribution@android.com> 1265386178 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1265386178 -0800

reconcile main tree with open-source eclair