| commit | 14961ab77a1352b44a44a59e8b02c31091b0ee9b | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Tue Jun 09 22:51:56 2015 -0700 |
| committer | Clay Murphy <claym@google.com> | Tue Jun 09 22:51:56 2015 -0700 |
| tree | b68503c87bdbc1cfc588377b2331d9962405b604 | |
| parent | 0285eb826517331e3d74cb919858a9c280ea6857 [diff] [blame] | |
| parent | 069b25ab7801d64e4e6ccc70972f96eaa0be3a6e [diff] [blame] |
resolved conflicts for merge of 069b25ab to mnc-dev-plus-aosp
diff --git a/src/compatibility/5.1/android-cdd-cover.css b/src/compatibility/5.1/android-cdd-cover.css index dcbcc2f..04133d6 100644 --- a/src/compatibility/5.1/android-cdd-cover.css +++ b/src/compatibility/5.1/android-cdd-cover.css
@@ -58,7 +58,7 @@ } .padding-bottom { - padding: 40px 20px 200px 60px; + padding: 40px 20px 194px 60px; } .cover-text { @@ -83,4 +83,4 @@ p { margin: 0px; padding: 0px; -} \ No newline at end of file +}