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

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