summaryrefslogtreecommitdiff
path: root/api/system-current.txt
diff options
context:
space:
mode:
author Ian Pedowitz <ijpedowitz@google.com> 2017-05-16 05:04:15 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 05:04:15 +0000
commit52e33eed24fdffc36dfd2d96eb4017e130efcba5 (patch)
tree5b9c5101bd9c3f6bb1ae290e399251e8e07fa93a /api/system-current.txt
parent3435681fbc397725a5f75df48af8089dad69c817 (diff)
parentb6290ff39ecd8e310a3ae32f3620cf8f1009ca8d (diff)
Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b
am: b6290ff39e Change-Id: If4c21c8d37d753b00e4478c21bf5e6dbe9f39288
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 2586f5f45ca0..0865c9626a2b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33242,7 +33242,7 @@ package android.os {
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19
- field public static final int O = 10000; // 0x2710
+ field public static final int O = 26; // 0x1a
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {