Merge "[proprietary-open]: wl12xx: Upload WLAN R5_00_05 firmware files" into ics-mr1
authorVicky Martinez-DeFrain <vmdefrain@gmail.com>
Mon, 5 Mar 2012 22:04:15 +0000 (16:04 -0600)
committerGerrit Code Review <gerrit2@git.omapzoom.org>
Mon, 5 Mar 2012 22:04:15 +0000 (16:04 -0600)

Trivial merge