am 663c39d4: reconcile main tree with open-source eclair · ius/android_external_wpa_supplicant@2cbe35e · GitHub

Commit

am 663c39d: reconcile main tree with open-source eclair

Browse files

Merge commit '663c39d4fd672cd52ca852d0717bfec955ebfa98' into eclair-plus-aosp

* commit '663c39d4fd672cd52ca852d0717bfec955ebfa98':
  android-2.1_r1 snapshot

Loading branch information

The Android Open Source Project authored and Android Git Automerger committed Feb 5, 2010

2 parents c66f7d2 + 663c39d commit 2cbe35e