[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 skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1369246b4ccis in history Change-Id: I44a77f2bc09685313a2fd1e1f3cc1e07cfc1500e
This commit is contained in: