tree 5badea6e08cf55c88ecd381017ff2ad5383d3aaf
parent 8b07e59d862d0cbfe6a640b444b142ac4fbb4f6e
parent 120f5a99235e9dd85fe0337589d144ad67052d15
author Dmitry Shmidt <dimitrysh@google.com> 1469747258 +0000
committer android-build-merger <android-build-merger@google.com> 1469747258 +0000

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

Change-Id: I3740103272eb6c9df2143a5926dc35d100440606