tree 4ee1d485f5b99abb55ab24218064ad8a32af96dc
parent d05e827b5bdc80384035d87391d066434677d34f
parent 98a4fb393659f9df9a12452fe25c345fbd026ff9
author The Android Open Source Project <initial-contribution@android.com> 1265408568 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408568 -0800

am 98a4fb39: am 47d39e43: reconcile main tree with open-source eclair

Merge commit '98a4fb393659f9df9a12452fe25c345fbd026ff9'

* commit '98a4fb393659f9df9a12452fe25c345fbd026ff9':
  android-2.1_r1 snapshot