DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 2dd68ad63f

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