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

Change-Id: I3126e27d6b39ee240f9679da4328ab3d1c3e1370
tree: 8a7b4b3cb9ef3edb5806fb7b4862a640d2c5451f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS