Reconcile eclair and master
tree: 3e847caf7129731bf7bd6d024e5168dcb272fa76
  1. Android.mk
  2. client.jar