Merge "[automerger skipped] Merge "Remove obsolete state" into qt-dev am: 47b4c6d5df -s ours am: 0f9c0cf7bb -s ours
am:01cd18b87c-s ours am skip reason: change_id I17fcd9eb5eba7e7bc88de09309f5c310fe13433f with SHA1de8c25ac2dis in history Change-Id: I98bc209ba1e80f6cc57a365eede14b77f424e587
This commit is contained in: