[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 1a1643e1e2 -s ours am: 060852808e am: aae13164c3 am: 3b9bd87ebf -s ours

am skip reason: subject contains skip directive

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