tree b98e2b81198a37bacd603c2328eddfa2d26f8d24
parent 4e7198a44d57ac3d4a3220c3ba671362fa8b46c9
parent bf23ae1f51763642d76e9acd41116eafeddb0449
author The Android Open Source Project <initial-contribution@android.com> 1264802888 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802888 -0800

reconcile android-2.1_r1 snapshot