tree f3f875cdb45927fda29bbdf3e896bc28269e9c5e
parent 843e864286334ee0d6d46ee90d3a359aa48d81d8
parent 03345d0caa2c5fa7314ffc41030646ed0712ae0a
author The Android Open Source Project <initial-contribution@android.com> 1354031080 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354031080 -0800

am 03345d0c: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '03345d0caa2c5fa7314ffc41030646ed0712ae0a':
  bcmdhd: Update bcm43241 firmware to version 6.10.170.4