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

am skip reason: subject contains skip directive

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