tree bfa96297c22d7442d7a8fe9f7a3c3bef9e35f398
parent 945fbce14d217ce05aae77e10e86aacdcc5917e2
parent e2befcd19263af93e7c922bfe29df7525d3d2878
author The Android Open Source Project <initial-contribution@android.com> 1264802891 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802891 -0800

reconcile android-2.1_r1 snapshot