tree 20a0e409741ff46fcbc458a399286619ee711798
parent 3952da144dc023605886a6c54a4625d061e13dcb
parent 8b223ac2de66ecb0dc3cf25362d634ff99363fcb
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