tree 1d737e10e51e8d16940d4e4dd49b55aba5acfac4
parent 3b1756f95884d975b512d023faaf1da254bc2185
parent 2b6b61853023a577af7d0c999bed689b30668ab3
author Sreeram Ramachandran <sreeram@google.com> 1406054982 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406054982 +0000

am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev

* commit '4463fd6540f152fe2548a67eb5a34489c11b3f31':
  Fix WiFi-Direct.