tree ea24bfc50c21a61633776fbb4c0d08bd2c814563
parent 713786ef31b80d164af9a23b31b43b2fcc8169ae
parent cc38a6bffcca90a9f8e4c4d803a3a668a1b8275d
author The Android Open Source Project <initial-contribution@android.com> 1264802876 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802876 -0800

reconcile android-2.1_r1 snapshot