tree 683545f5b13bbd4cc608f97f593affb76ab55d1e
parent 87a52147753aebb1ab4721663899c30223a44d5d
parent cacdd4fc3f67da6812dc0d0ecab487e626e49cfa
author Vinit Deshpande <vinitd@google.com> 1444245817 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444245817 +0000

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

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