tree 42598c446081b600cb38500076270ae500decb4d
parent ee652d5b6bac336caec6536abab27431f79bb902
parent 2db4db04ec38c53f9189070782f2d1be7832761e
author Ying Wang <wangying@google.com> 1386278231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386278231 +0000

am 2db4db04: am 243e04f8: Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"

* commit '2db4db04ec38c53f9189070782f2d1be7832761e':
  Treat VER_2_1_DEVEL the same as VER_0_8_X
  Android: Do not compile wpa_supplicant if not chosen