From 6a509cf4a598c1595c8a237b8b1579f91ebc922b Mon Sep 17 00:00:00 2001
From: Suprabh Shukla <suprabh@google.com>
Date: Mon, 29 Apr 2019 17:07:51 -0700
Subject: [PATCH] Adding version code R for development

Test: Builds

Bug: 129975435
Change-Id: I26ef76266b2f52746ca08a45f5013c580cecd4fb
Merged-In: I26ef76266b2f52746ca08a45f5013c580cecd4fb
(cherry picked from commit 1d081c503c67b76af909b6aa3e66e2e71493e045)
---
 api/current.txt                 | 1 +
 core/java/android/os/Build.java | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index bf3b525ec9f4e..d344c2bf4a72b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34211,6 +34211,7 @@ package android.os {
     field public static final int O_MR1 = 27; // 0x1b
     field public static final int P = 28; // 0x1c
     field public static final int Q = 29; // 0x1d
+    field public static final int R = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index f21956bfe607b..77874438cc813 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -992,6 +992,11 @@ public class Build {
          * engaged. It's now time to see if you can dance.</em>
          */
         public static final int Q = 29;
+
+        /**
+         * R.
+         */
+        public static final int R = CUR_DEVELOPMENT;
     }
 
     /** The type of build, like "user" or "eng". */