tree 683545f5b13bbd4cc608f97f593affb76ab55d1e
parent 5e5f50da9ee67dc6d081c5aded4f7132cb84882e
parent 03e4ac9ff46f5afaf86a306fd0315d6f0e18bcd6
author Vinit Deshpande <vinitd@google.com> 1444246148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444246148 +0000

am 03e4ac9f: am cacdd4fc: Merge "Fix mismatched buffer size in supplicant and WifiNative" into mnc-dr-dev

* commit '03e4ac9ff46f5afaf86a306fd0315d6f0e18bcd6':
  Fix mismatched buffer size in supplicant and WifiNative