tree b40f532a067bd747435f68d6c311476db0f9ad44
parent fc90b3c2cc86b93003764a5be17dbf7cc4b00a90
parent 0a123841364285317136d2ca29ad7b8c7a776c31
author Roshan Pius <rpius@google.com> 1485814554 +0000
committer android-build-merger <android-build-merger@google.com> 1485814554 +0000

Merge "wpa_supplicant(hidl): Use macros for WPS param sizes" am: a16284d559 am: 48e3858d57
am: 0a12384136

Change-Id: I7f0be9c02dfcfb866c2363f7eb5bf5768557be0b