tree 0734f14b9b1c84bb0a8bdb160d9af0246be50ab3
parent 38887904cc25b6918adc59144b972c63a0070f71
parent 637d867b308b2603bfcecce8e9244b4853aa393e
author The Android Open Source Project <initial-contribution@android.com> 1323471459 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323471459 -0800

am 637d867b: Reconcile with ics-mr1-release

* commit '637d867b308b2603bfcecce8e9244b4853aa393e':
  bcmdhd: Update bcm4329 FW to version 5.90.125.94.1 (4.220.53.0)