tree 9d313bdf6a27499d031634f65ba6237c1559b700
parent 1661f734d42e48458fc62f5c6413c308481b4e5a
parent cd833afad15fedab2ca1f2c39ea2d450cd41c2df
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