tree 8a76c367f1542e091dacfb71fc484f4e45eb9223
parent e8dd3d5774057f923630005999fe3fb6616bd337
parent 03b8960f4811bf8bc6b11dae08f66860278f08a6
author The Android Open Source Project <initial-contribution@android.com> 1264802887 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802887 -0800

reconcile android-2.1_r1 snapshot