[automerger skipped] Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev am: d3b53e080d am: 1ac726e718 -s ours am: ee06f1664c -s ours
am:7c2e256879-s ours am skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1369246b4ccis in history Change-Id: Id07b2773fde5d255c404f488a99f3ffe471653a5
This commit is contained in: