merge from open-source master
[android/platform/external/ppp.git] /
drwxr-xr-x android
drwxr-xr-x pppd