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

Change-Id: I7a3e9861f4afa7a89d8a312718b46a95b4d6805c
2020-04-10 23:20:40 +00:00
parent d9a89502b0 d88d0431dc
commit 19b51e0838
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 = {