am dbbd8aed: reconcile main tree with open-source eclair

Merge commit 'dbbd8aed7ea208bda62db316dd31900b938fabfa' into eclair-plus-aosp

* commit 'dbbd8aed7ea208bda62db316dd31900b938fabfa':
  android-2.1_r1 snapshot
tree: e2ab362c2ceafa20b35797160659ef1595b586a8
  1. bcm4329/
  2. .gitignore