Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19b51e08 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I7a3e9861f4afa7a89d8a312718b46a95b4d6805c
parents d9a89502 d88d0431

tools/aapt2/SdkConstants.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ namespace aapt { 




static ApiVersion sDevelopmentSdkLevel = 10000;

static ApiVersion sDevelopmentSdkLevel = 10000;

static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>({

static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>({

    "Q", "R"

    "Q", "R", "S"

});

});





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

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