merge
tree: 43ffd64543bcca5a0fe2f3fa1c9903160af2b801
  1. Android.mk
  2. client.jar