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

am: 40a8e99740

Change-Id: I1e2472a230baae25c2abe070a0ec75b9a8319c06

api/current.txt

@@ -34158,7 +34158,7 @@ package android.os {
     field public static final int O = 26; // 0x1a
     field public static final int O_MR1 = 27; // 0x1b
     field public static final int P = 28; // 0x1c
-    field public static final int Q = 29; // 0x1d
+    field public static final int Q = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

@@ -977,7 +977,8 @@ public class Build {
          * to come. Con permiso, Capitan. The hall is rented, the orchestra
          * engaged. It's now time to see if you can dance.</em>
          */
-        public static final int Q = 29;
+        public static final int Q = CUR_DEVELOPMENT;
+
     }
 
     /** The type of build, like "user" or "eng". */

tools/aapt/SdkConstants.h

@@ -44,7 +44,6 @@ enum {
     SDK_O = 26,
     SDK_O_MR1 = 27,
     SDK_P = 28,
-    SDK_Q = 29,
 };
 
 #endif // H_AAPT_SDK_CONSTANTS

tools/aapt2/SdkConstants.h

@@ -54,7 +54,6 @@ enum : ApiVersion {
   SDK_O = 26,
   SDK_O_MR1 = 27,
   SDK_P = 28,
-  SDK_Q = 29,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);