diff options
| author | Clay Murphy <claym@google.com> | 2015-06-12 16:34:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-12 16:34:00 +0000 |
| commit | 2725adb783049702235429bfa0024e99c2bbd749 (patch) | |
| tree | 75561f5e72fe7ede20819e66aa12ed5972487e2c | |
| parent | c53432aa85ab158fce499fc18ca91fd956638353 (diff) | |
| parent | a36452676a85127d6162e79b71b6b21a23e9b9db (diff) | |
| download | source.android.com-2725adb783049702235429bfa0024e99c2bbd749.tar.gz | |
am a3645267: resolved conflicts for merge of 2d7a1617 to lmp-mr1-ub-dev
* commit 'a36452676a85127d6162e79b71b6b21a23e9b9db':
Docs: Adding final 5.1 docs (html, css, pdf) Making android-cdd.pdf be 5.1 instead of 4.4
| -rw-r--r-- | src/compatibility/5.1/android-5.1-cdd.html | 2 | ||||
| -rw-r--r-- | src/compatibility/5.1/android-5.1-cdd.pdf | bin | 579691 -> 708740 bytes | |||
| -rw-r--r-- | src/compatibility/5.1/android-cdd-body.pdf | bin | 499035 -> 499442 bytes | |||
| -rw-r--r-- | src/compatibility/5.1/android-cdd-cover.css | 2 | ||||
| -rw-r--r-- | src/compatibility/5.1/android-cdd-cover.pdf | bin | 215475 -> 235457 bytes | |||
| -rw-r--r-- | src/compatibility/5.1/android-cdd-cover_5_1.html | 4 | ||||
| -rw-r--r-- | src/compatibility/android-cdd.pdf | bin | 2294360 -> 708740 bytes | |||
| -rw-r--r-- | src/compatibility/images/android-lollipop-mr1.jpg | bin | 0 -> 598066 bytes |
8 files changed, 4 insertions, 4 deletions
diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html index f6c4872f..9b9ff55e 100644 --- a/src/compatibility/5.1/android-5.1-cdd.html +++ b/src/compatibility/5.1/android-5.1-cdd.html @@ -161,7 +161,7 @@ </div> -<div style="clear: both; page-break-after:always; height:15px"></div> +<div style="clear: both; page-break-after:always; height:1px"></div> <div id="toc_left_2"> diff --git a/src/compatibility/5.1/android-5.1-cdd.pdf b/src/compatibility/5.1/android-5.1-cdd.pdf Binary files differindex 483f25a5..78a98578 100644 --- a/src/compatibility/5.1/android-5.1-cdd.pdf +++ b/src/compatibility/5.1/android-5.1-cdd.pdf diff --git a/src/compatibility/5.1/android-cdd-body.pdf b/src/compatibility/5.1/android-cdd-body.pdf Binary files differindex 37402d3b..df0552d1 100644 --- a/src/compatibility/5.1/android-cdd-body.pdf +++ b/src/compatibility/5.1/android-cdd-body.pdf diff --git a/src/compatibility/5.1/android-cdd-cover.css b/src/compatibility/5.1/android-cdd-cover.css index dcbcc2fe..7364deb0 100644 --- a/src/compatibility/5.1/android-cdd-cover.css +++ b/src/compatibility/5.1/android-cdd-cover.css @@ -58,7 +58,7 @@ td { } .padding-bottom { - padding: 40px 20px 200px 60px; + padding: 40px 20px 194px 60px; } .cover-text { diff --git a/src/compatibility/5.1/android-cdd-cover.pdf b/src/compatibility/5.1/android-cdd-cover.pdf Binary files differindex f1e21696..90f12e95 100644 --- a/src/compatibility/5.1/android-cdd-cover.pdf +++ b/src/compatibility/5.1/android-cdd-cover.pdf diff --git a/src/compatibility/5.1/android-cdd-cover_5_1.html b/src/compatibility/5.1/android-cdd-cover_5_1.html index a59caf97..25eaefec 100644 --- a/src/compatibility/5.1/android-cdd-cover_5_1.html +++ b/src/compatibility/5.1/android-cdd-cover_5_1.html @@ -17,14 +17,14 @@ <tr> <td> -<img src="../images/android-lollipop.jpg" alt="Lollipop logo" style="border-top: 5px solid orange; border-bottom: 5px solid orange"/> +<img src="../images/android-lollipop-mr1.jpg" alt="Lollipop logo" style="border-top: 5px solid orange; border-bottom: 5px solid orange"/> </td> </tr> <tr> <td> <p class="subtitle">Android 5.1</p> -<p class="cover-text">Last updated: April 1, 2015</p> +<p class="cover-text">Last updated: June 9th, 2015</p> <p class="cover-text">Copyright © 2015, Google Inc. All rights reserved.</p> <p class="cover-text"><a href="mailto:compatibility@android.com">compatibility@android.com</a></p> </td> diff --git a/src/compatibility/android-cdd.pdf b/src/compatibility/android-cdd.pdf Binary files differindex f29d0812..78a98578 100644 --- a/src/compatibility/android-cdd.pdf +++ b/src/compatibility/android-cdd.pdf diff --git a/src/compatibility/images/android-lollipop-mr1.jpg b/src/compatibility/images/android-lollipop-mr1.jpg Binary files differnew file mode 100644 index 00000000..c9b757de --- /dev/null +++ b/src/compatibility/images/android-lollipop-mr1.jpg |
