tree 8aa01130b5ade34bd2d76bee6c2ad6f4cb11ffbe
parent 6ff4f0bd376f94d4876141c063c632b73c9e43a8
parent 4839c2ae1d2815bf06ec57d14e1871179a5e9821
author The Android Open Source Project <initial-contribution@android.com> 1264802899 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802899 -0800

reconcile android-2.1_r1 snapshot