reconcile main tree with open-source eclair
tree: 9d313bdf6a27499d031634f65ba6237c1559b700
  1. android/
  2. pppd/