am a37baf0a: reconcile main tree with open-source eclair

Merge commit 'a37baf0a47b15211bd5c8e0acbd9a9f090587f82' into eclair-plus-aosp

* commit 'a37baf0a47b15211bd5c8e0acbd9a9f090587f82':
  android-2.1_r1 snapshot
tree: f648558d9b1cb4f4366e16ee782c1f907024e365
  1. Android.mk
  2. l2tp.c
  3. MODULE_LICENSE_APACHE2
  4. mtpd.c
  5. mtpd.h
  6. NOTICE
  7. pptp.c