forked from openkylin/platform_build
[automerger skipped] Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd92
am: 22ccf36b1b
-s ours am: f83d417dd5
-s ours
am skip reason: Change-Id Ic8a8adb3fffb357754384ddbf13684d944a9767e with SHA-1 151dd8fadb
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599825
Change-Id: Idcca85eb3936fce2f08676ca89f0bf0b86a885af
This commit is contained in:
commit
7b6d60b041