[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 70ce3f23e9 -s ours am: 824b99c5ac am: 76072f421c

Change-Id: I1bb77a766711c610653107ce1ad77c6fe9b9d79e
tree: 1d8088cb9b977e9f8f429be1ccfa35aca192c263
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/