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

Change-Id: I4993561f1a5c76f4976c373f5b57fac74fbdff8c
tree: f2c8dedcc2d474646878fb7c4e41edb24a92d496
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk
  7. OWNERS