OSDN Git Service

am ac23c640: am 96ae93e4: (-s ours) am b74c0b2a: Merge "wifi: Check for the sizeof...
authorVinit Deshpande <vinitd@google.com>
Thu, 27 Aug 2015 20:20:19 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:20:19 +0000 (20:20 +0000)
* commit 'ac23c640b53d6353504946e76b9a004c456e0b5c':


Trivial merge