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

am skip reason: subject contains skip directive

Change-Id: Ieea580619bf7db2aecd5a24cbeb982f64e6942b3
tree: b515a6089b88282147b4236215172da07aad848c
  1. bootctrl/
  2. libhwcomposer/
  3. Android.bp
  4. OWNERS