am 4b4babc8: am dbbd8aed: reconcile main tree with open-source eclair

Merge commit '4b4babc89eee20d614ccbb5217b1544626959614'

* commit '4b4babc89eee20d614ccbb5217b1544626959614':
  android-2.1_r1 snapshot
tree: b1f8ee310e96826560740ca6590291a283c54b51
  1. bcm4329/
  2. .gitignore