tree c42229a7ae0f2fa7981f8a2fcedff9bbc0272e9f
parent dd848041237b660bad38e6567cbfc0c0c5161c24
parent db4323822f1daed385388f55f35b47b084e8992f
author The Android Open Source Project <initial-contribution@android.com> 1264802878 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802878 -0800

reconcile android-2.1_r1 snapshot