tree ebc86cb5436e3ff6883e4ec9d6ecd24355c0fbf4
parent 9dccbdca70ddd28d2483f0d01a4e8a138156f263
parent d3b53e080d1729977ea85eefbc417b6688943113
author Adrian Roos <roosa@google.com> 1565900420 -0700
committer android-build-merger <android-build-merger@google.com> 1565900420 -0700

Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev
am: d3b53e080d

Change-Id: I6da708a8b05f762af1b781db75aa2511aa895abf