tree 269e085d6ada7d553d7b5a3339c05463d1eaa9de
parent 1aa380cac2de40e33c92ec071395ac1d05bc878c
parent f5a650cd76b6b4c184715b80e7956e7ba7422583
author Xin Li <delphij@google.com> 1572473497 -0700
committer android-build-merger <android-build-merger@google.com> 1572473497 -0700

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

Change-Id: Id8ccbcda7a25feb1cc86bcd4f159d1d826d6a50b