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

Change-Id: If6ff7558a0239e9f92f97eee2fe5d3faba02b1bf
tree: f73ce7d679b4f3762e8fcda98b22a116cbe5d99b
  1. art/
  2. hwbinder/
  3. hwui/
  4. scripts/
  5. .gitignore
  6. OWNERS