tree 80b3d5cf91a9b2a5a30585b9699d0ac10e131702
parent bbb8c49cedc75e424805f3a13656861ae203f5f1
parent 280dd0135a308847cc881dbf3feb5b1145158206
author The Android Open Source Project <initial-contribution@android.com> 1265407718 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407718 -0800

am 280dd013: am 5c26a1c0: reconcile main tree with open-source eclair

Merge commit '280dd0135a308847cc881dbf3feb5b1145158206'

* commit '280dd0135a308847cc881dbf3feb5b1145158206':
  android-2.1_r1 snapshot