[automerger skipped] Merge "Properly use versioned interfaces." into qt-dev am: efc774b76c -s ours am: be092469ac -s ours
am:671a0df6d6-s ours am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA191ddb23d66is in history Change-Id: I4cbc1eb8edbc44b85caa08ade3ce9f6673c92152
This commit is contained in: