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