tree b321622187db63fbd219e5cb83c0006afcaf88be
parent 241299bf9b1c40412678c0b9f75be55da1c3e171
parent 2da0ad6da32a4506138a7c0b8be71603e40d8db6
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