[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 560d84f535 -s ours am: 6c82caa1e8 am: efeaa22db2 am: 746310a307 -s ours

am skip reason: subject contains skip directive

Change-Id: I541419c9da46d96d5965cd369c041d0b6ab24634
tree: b111d4be8df27ec2039f8a213c007ecfa82b74fc
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags