[automerger skipped] Merge "Fix a bug where + before % is ignored" into qt-dev
am:55a1d5bd5f-s ours am skip reason: change_id Ibe73a33264569b08cac4c00b4dda838f1e5551fc with SHA176c76902a6is in history Change-Id: I1cb91f0b62492eb0c1ffa9112d7a3d94164852e0
This commit is contained in: