tree f81a5ac2c427830beee43f166f8e9c194b080204
parent ecd48ece32418bc01bd134a84132a66d33463fb0
parent b8abc5c12adb6b5b71f63366f5b8164e0bb4048d
author The Android Open Source Project <initial-contribution@android.com> 1264802867 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1264802867 -0800

reconcile android-2.1_r1 snapshot