summaryrefslogtreecommitdiff
path: root/tools/aapt2/SdkConstants.h
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2017-08-26 02:41:46 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-26 02:41:46 +0000
commit800af77f9cd4847834ad18fe71565c84b72f96d4 (patch)
tree260e0b43584cb8066eb4a304effb5809d77fc41a /tools/aapt2/SdkConstants.h
parent46748d5070f360b5a3b527ff71a56e03e0d8e50f (diff)
parentd489d122f42af3c6c308afef59a2948a115e8d31 (diff)
Merge "O MR1 is API 27" into oc-mr1-dev
am: d489d122f4 Change-Id: I7e4e4a710ce874502b1e749a9892e46619a988df
Diffstat (limited to 'tools/aapt2/SdkConstants.h')
-rw-r--r--tools/aapt2/SdkConstants.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 864e57d644a6..5c32ed4fd849 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -52,7 +52,7 @@ enum : ApiVersion {
SDK_NOUGAT = 24,
SDK_NOUGAT_MR1 = 25,
SDK_O = 26,
- SDK_O_MR1 = 10000, // STOPSHIP Replace with the real version.
+ SDK_O_MR1 = 27,
};
ApiVersion FindAttributeSdkLevel(const ResourceId& id);