[automerger skipped] Merge "Revert submission" into qt-qpr1-dev am: 775106e40d
am:59185d0931-s ours am skip reason: change_id I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f with SHA1979b95777ais in history Change-Id: I982ca7c43ce8683d3139a8960aefd4e520bebd57
This commit is contained in: