[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 41749594da
am: 637cd57e21 -s ours
am skip reason: subject contains skip directive

Change-Id: I65b6635fca3d99181484ac1557e4cd200530f5de
tree: 12951dcff1a26f644b1a74247a662087e39f30c2
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS