[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 24c45a1092 -s ours am: fe088d8a7f

Change-Id: Ieee0735431b04ea73113c9e204fafcf9505515c8
tree: eb1534824b8c971f4195b967e9adb3d2b974ba3b
  1. pppd/
  2. Android.bp
  3. CleanSpec.mk
  4. OWNERS
  5. README.version