diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-04-28 16:57:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-28 16:57:26 +0000 |
| commit | 137e30ae7bcfd0a7e2e272affc25a7770c9b626b (patch) | |
| tree | 113b85efb8a518ecc6a8cd739e9677671cc49568 | |
| parent | 0f018570fff044bb68b8009815ae7e5c397d09fd (diff) | |
| parent | 8398e8261e451358b779514569825ae7a94ef579 (diff) | |
Merge "Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"" into nyc-dev
| -rw-r--r-- | core/res/res/drawable-nodpi/default_wallpaper.png | bin | 359039 -> 320012 bytes |
| -rw-r--r-- | core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png | bin | 759610 -> 1197339 bytes |
| -rw-r--r-- | core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png | bin | 4694185 -> 1930496 bytes |
| -rw-r--r-- | tests/HwAccelerationTest/res/drawable/default_wallpaper.png | bin | 438514 -> 320012 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/core/res/res/drawable-nodpi/default_wallpaper.png b/core/res/res/drawable-nodpi/default_wallpaper.png Binary files differindex e9c4d5c6c696..91ad252507e5 100644 --- a/core/res/res/drawable-nodpi/default_wallpaper.png +++ b/core/res/res/drawable-nodpi/default_wallpaper.png diff --git a/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png b/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png Binary files differindex 9f3efa533b9e..af8e2512385a 100644 --- a/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png +++ b/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png diff --git a/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png b/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png Binary files differindex 8199e706cf95..cb00d82a826f 100644 --- a/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png +++ b/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png diff --git a/tests/HwAccelerationTest/res/drawable/default_wallpaper.png b/tests/HwAccelerationTest/res/drawable/default_wallpaper.png Binary files differindex 187a6c07704a..91ad252507e5 100644 --- a/tests/HwAccelerationTest/res/drawable/default_wallpaper.png +++ b/tests/HwAccelerationTest/res/drawable/default_wallpaper.png |
