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

Change-Id: I2a2c61a02c6a7d8a18812d7812252f4cfde0b8b0
tree: 3a5b26e145f6189bd77e7bf27090cad9404ff208
  1. configs/
  2. gae/
  3. proto/
  4. script/
  5. .gitignore
  6. __init__.py
  7. OWNERS
  8. PREUPLOAD.cfg