commit c73edfa45cdac5cee6c1c04d3bf220653b1ef788
author Gina Dimino <gdimino@google.com> Wed Jan 23 10:46:16 2019 -0800
committer Gina Dimino <gdimino@google.com> Wed Sep 04 23:09:47 2019 +0000
tree 608745fae0bd5f634d505cf6b0af6129823dd122
parent 30de4fa7e5f158f05f206a8f4cb4bda5d90ad992

Docs: CDD build scripts and graphics for 10.

Bug: 140142603

Test: ./cdd_gen.sh --version <version-number> --branch <branch-name>
Change-Id: I6174c3bbc7f6c818cbf232e9c30b3ab636b4a373

make_cdd.py

diff --git a/make_cdd.py b/make_cdd.py
index 48f5aad..c447cb3 100755
--- a/make_cdd.py
+++ b/make_cdd.py
@@ -23,11 +23,8 @@
 
 
 HEADERS_FOR_TOC = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7']
-<<<<<<< HEAD
 global ANDROID_VERSION
-ANDROID_VERSION = "7.0, (N)"
-=======
->>>>>>> 1a3acad3... CDD build script and helper shell script.
+ANDROID_VERSION = "10"
 TOC_PER_COL = 34
 
 def get_section_info(my_path):