| commit | b12ae58e919b7d991b596ae8e7ae575dec153c80 | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Tue Jul 22 18:49:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 22 18:49:42 2014 +0000 |
| tree | 1d737e10e51e8d16940d4e4dd49b55aba5acfac4 | |
| parent | 3b1756f95884d975b512d023faaf1da254bc2185 [diff] | |
| parent | 2b6b61853023a577af7d0c999bed689b30668ab3 [diff] |
am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev * commit '4463fd6540f152fe2548a67eb5a34489c11b3f31': Fix WiFi-Direct.