Merge "Master is now S" into rvc-dev-plus-aosp am: d88d0431dc am: 19b51e0838

Change-Id: Ia711c613124dcb9795bcc929aa0c80dba9a5b7b7
2020-04-10 23:38:05 +00:00
parent 487376786f 19b51e0838
commit 175083fba5
1 changed files with 1 additions and 1 deletions
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -27,7 +27,7 @@ namespace aapt {

 static ApiVersion sDevelopmentSdkLevel = 10000;
 static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>({
-    "Q", "R"
+    "Q", "R", "S"
 });

 static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {