| commit | 82ae155090c7dc584436b5b0f4ddcb8b96ed8f6c | [log] [tgz] |
|---|---|---|
| author | Vinit Deshapnde <vinitd@google.com> | Thu Dec 05 22:50:48 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:50:48 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 4ab86382f5276f142a56ccea73a1dddb12c7c938 [diff] | |
| parent | ba690f48b95010f096c4df04b5fec91bf6bf73c7 [diff] |
am ba690f48: (-s ours) am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev * commit 'ba690f48b95010f096c4df04b5fec91bf6bf73c7':