tree 5badea6e08cf55c88ecd381017ff2ad5383d3aaf
parent 79a5b802f3753f5827edc44580cea8e6716ff26c
parent 5e65a9d712052264fab954ee4880eba026e05a2c
author John Stultz <john.stultz@linaro.org> 1469747407 +0000
committer android-build-merger <android-build-merger@google.com> 1469747407 +0000

Merge \\\"hikey: wl18xx-fw: Update wifi firmware\\\" am: 73e309eb88 am: 120f5a9923
am: 5e65a9d712

Change-Id: I528ed810564b17cb7b56f89060d70ad5df49a3b5