| commit | 949f608c2ab20b755d0abe501fca1e597b9e9bfc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 27 07:44:40 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 07:44:40 2012 -0800 |
| tree | f3f875cdb45927fda29bbdf3e896bc28269e9c5e | |
| parent | 843e864286334ee0d6d46ee90d3a359aa48d81d8 [diff] | |
| parent | 03345d0caa2c5fa7314ffc41030646ed0712ae0a [diff] |
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