Merge "Master is now S" am: f86f9eddd2

Change-Id: Ib2a25d33a71ce0bfc3bd14b702b7a2d80088b815
This commit is contained in:
Dan Willemsen
2020-04-11 01:30:32 +00:00
committed by Automerger Merge Worker

View File

@@ -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 = {