tree ee3abb56d9cd00e2efe6985aff4332a8fd5d3cb8
parent c5bfcd55fde29ac2fe9523a42f8e63b01a3c32ae
parent 526efacb2efabe0d9c8b0d7dc5c40c1820819f20
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