aboutsummaryrefslogtreecommitdiff
path: root/en/compatibility/cts/development.html
diff options
context:
space:
mode:
Diffstat (limited to 'en/compatibility/cts/development.html')
-rw-r--r--en/compatibility/cts/development.html12
1 files changed, 11 insertions, 1 deletions
diff --git a/en/compatibility/cts/development.html b/en/compatibility/cts/development.html
index ae4c6e7e..249f1539 100644
--- a/en/compatibility/cts/development.html
+++ b/en/compatibility/cts/development.html
@@ -252,6 +252,16 @@ updated from time to time as CTS for the given Android version matures.</p>
</thead>
<tbody>
<tr>
+ <td>8.0</td>
+ <td>oreo-cts-dev</td>
+ <td>Monthly</td>
+ </tr>
+<tr>
+ <td>7.1</td>
+ <td>nougat-mr1-cts-dev</td>
+ <td>Monthly</td>
+ </tr>
+<tr>
<td>7.0</td>
<td>nougat-cts-dev</td>
<td>Monthly</td>
@@ -306,7 +316,7 @@ Open Source Project (AOSP).
branch will automatically merge as below:<br>
jb-dev-> jb-mr1.1-cts-dev -> jb-mr2-cts-dev -> kitkat-cts-dev ->
lollipop-cts-dev -> lollipop-mr1-cts-dev -> marshmallow-cts-dev ->
-nougat-cts-dev -> &lt;private-development-branch for Android N MR1&gt;</p>
+nougat-cts-dev -> nougat-mr1-cts-dev -> oreo-cts-dev -> &lt;private-development-branch for Android O MR1&gt;</p>
<p>If a changelist (CL) fails to merge correctly, the author of the CL will get
an email with instructions on how to resolve the conflict. In most of the