tree 91cba3d4c4e694953f72605c4fee7b9be933d0cb
parent 56ba52dc0e384088414d6744634ae36001c5c2fd
parent 2e50db22360222a36f5a32eeabdf0daec39c61a9
author Elliott Hughes <enh@google.com> 1387318835 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387318835 -0800

am 2e50db22: Fix pppd to build with both old and uapi headers.

* commit '2e50db22360222a36f5a32eeabdf0daec39c61a9':
  Fix pppd to build with both old and uapi headers.