tree b321622187db63fbd219e5cb83c0006afcaf88be
parent 241299bf9b1c40412678c0b9f75be55da1c3e171
parent f4a59f04215a894a39ee1bad80e7760f535e5a80
author The Android Open Source Project <initial-contribution@android.com> 1264802891 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802891 -0800

reconcile android-2.1_r1 snapshot