tree f96c3fc70526d98cb381629774f2f290fee2b168
parent 17a47098d2a4214397f8b30e2692c9487d7ab5ff
parent b765729081399b6826c9d45d77c9c58ca2f32816
author The Android Open Source Project <initial-contribution@android.com> 1264802851 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802851 -0800

reconcile android-2.1_r1 snapshot