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

Merge commit '98a4fb393659f9df9a12452fe25c345fbd026ff9'

* commit '98a4fb393659f9df9a12452fe25c345fbd026ff9':
  android-2.1_r1 snapshot
tree: 4ee1d485f5b99abb55ab24218064ad8a32af96dc
  1. .gitignore
  2. Android.mk
  3. lib/
  4. sta_dk_4_0_4_32/
  5. wilink_6_1/