OSDN Git Service

am 96ae93e4: (-s ours) am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start...
authorVinit Deshpande <vinitd@google.com>
Thu, 27 Aug 2015 11:35:05 +0000 (11:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:35:05 +0000 (11:35 +0000)
* commit '96ae93e4d602f15c2878c1788abab3917d3efbf2':


Trivial merge