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

Change-Id: I9b03c45060b5e7b436b21b5a9dbb911629973e72
tree: 0ec013b648cebf24d9a5c442df5eb532799df28b
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml