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