Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev

This commit is contained in:
Ian Pedowitz
2019-05-02 00:59:09 +00:00
committed by Android (Google) Code Review

View File

@@ -71,7 +71,6 @@ func getApiLevelsMap(config Config) map[string]int {
"O": 26, "O": 26,
"O-MR1": 27, "O-MR1": 27,
"P": 28, "P": 28,
"Q": 29,
} }
for i, codename := range config.PlatformVersionCombinedCodenames() { for i, codename := range config.PlatformVersionCombinedCodenames() {
apiLevelsMap[codename] = baseApiLevel + i apiLevelsMap[codename] = baseApiLevel + i