[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 04897a9bbd am: b5d5a667c3 -s ours am: 91500f3e9d am: 8c9c449e87
Change-Id: Iddd5a7116d08f1e4f5e33d9b6c00c074aee23efd
This commit is contained in: