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

This commit is contained in:
TreeHugger Robot
2020-04-10 22:51:12 +00:00
committed by Android (Google) Code Review

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