commit e65302190b96aea16a631048556b1bbafea16664
author Ian Pedowitz <ijpedowitz@google.com> Sat May 11 17:02:50 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 15 23:02:59 2019 +0000
tree b1b5e87921214323e8fe3f4bc67a5e3e508d5ad3
parent 8c4e4ad32eca921f8067ea4f3b3ec58d3b827b21

Revert "Revert "Android Q is API 29""

This reverts commit 9e2bf9ec51ad16e8bc8f3754eadc2cd4a0b40e73.

Reason for revert: Rolling forward for Q-Finalization

Bug: 129975435
Bug: 129943426
Change-Id: Ic8a09aca67c189edfda4b10e5deb13716eb66adc
Test: Build
(cherry picked from commit 851de71044142e944f4158970973af1c50ed32d6)

android/api_levels.go

diff --git a/android/api_levels.go b/android/api_levels.go
index 51d4703..2f70f62 100644
--- a/android/api_levels.go
+++ b/android/api_levels.go
@@ -71,6 +71,7 @@
 			"O":     26,
 			"O-MR1": 27,
 			"P":     28,
+			"Q":     29,
 		}
 		for i, codename := range config.PlatformVersionCombinedCodenames() {
 			apiLevelsMap[codename] = baseApiLevel + i