[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f8c1e67cfc -s ours

am skip reason: subject contains skip directive

Change-Id: Ia459497d500f37c0fe478d32e6a3a1721185c942
tree: 2aef583d37aacaa53f39d7786c98aec433ab10f0
  1. include/
  2. lib/
  3. templates/
  4. tools/
  5. unittests/
  6. Android.bp
  7. LICENSE.TXT
  8. OWNERS