tree ab8d4259363f11c8912ef31315336f0d091d1d82
parent 6caadf281d923c036a6385a752dbeca026dd8948
parent b6559054998cc816d8755eef948fce4d27ec5341
author Chih-hung Hsieh <chh@google.com> 1510123505 +0000
committer android-build-merger <android-build-merger@google.com> 1510123505 +0000

Merge "Revert "Use -Werror in hardware/broadcom/wlan/bcmdhd""
am: b655905499

Change-Id: Ib01d3f262d79c15c6a3662e60e9c3610fe2cdd85