tree cd0b0b7bd9d1346b4cb18678cec0d15d8ea47df7
parent 5959bdc213c1da62e3fad4fa39bde16c4572a399
parent aaf5137b8e745d5f3b2103193ddc09cbc6f02027
author The Android Open Source Project <initial-contribution@android.com> 1264802908 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802908 -0800

reconcile android-2.1_r1 snapshot