diff options
| author | Clay Murphy <claym@google.com> | 2015-06-12 09:20:58 -0700 |
|---|---|---|
| committer | Clay Murphy <claym@google.com> | 2015-06-12 09:20:58 -0700 |
| commit | a36452676a85127d6162e79b71b6b21a23e9b9db (patch) | |
| tree | 7d8cf51a4b366e1eda2618510c4573d6eeddbf4f | |
| parent | 04c5cc6310761d468dae03c2182d4b61e52e6320 (diff) | |
| parent | 2d7a16177b50af0ebd4ab143dcdf9a1420af994e (diff) | |
| download | source.android.com-a36452676a85127d6162e79b71b6b21a23e9b9db.tar.gz | |
resolved conflicts for merge of 2d7a1617 to lmp-mr1-ub-dev
| -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 |
