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