Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Iceb608472c526a4a19c5b3f0ef1901777f69fe60
This commit is contained in:
TreeHugger Robot
2020-04-10 23:45:40 +00:00
committed by Automerger Merge Worker
parent f55be44ca2 175083fba5
commit b40aa702dc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt2/SdkConstants.cpp
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 = {