tree a5d3ea486b907c77abd820d7df12fb224ed0a417
parent 6934ac109bf80019d70ea684c203f12ca58c365e
parent a81cef2c38d3a2ee610ff7fff2e775c243ec8543
author The Android Open Source Project <initial-contribution@android.com> 1265386177 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1265386177 -0800

reconcile main tree with open-source eclair