am 47d39e43: reconcile main tree with open-source eclair

Merge commit '47d39e439b2caac66ca425b4eeeded8569e5ff4d' into eclair-plus-aosp

* commit '47d39e439b2caac66ca425b4eeeded8569e5ff4d':
  android-2.1_r1 snapshot
tree: 46035e06b198764db91819d8b7a7347a90f96e2e
  1. .gitignore
  2. Android.mk
  3. lib/
  4. sta_dk_4_0_4_32/
  5. wilink_6_1/