diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-10 22:51:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-10 22:51:12 +0000 |
| commit | d88d0431dc6c644d06804d098bcc22c74825d118 (patch) | |
| tree | bdc619887aa67cf2386dba4c43840a970e2475a5 /tools | |
| parent | 5e6ddc82ef2fa843216637d6a8fae60f99a006f9 (diff) | |
| parent | c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d (diff) | |
Merge "Master is now S" into rvc-dev-plus-aosp
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt2/SdkConstants.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp index b4b6ff1daaaa..304bc4925831 100644 --- 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 = { |