tree 8c7b51a78205a9a448dec9a8212b907e24fe700c
parent f6071db8c6f4192253a3c544379ad35dcb64dab0
parent 02a23d65d852682fff00e6f22fce491da7d0b833
author The Android Open Source Project <initial-contribution@android.com> 1264802883 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802883 -0800

reconcile android-2.1_r1 snapshot