diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:23:07 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:23:07 +0100 |
| commit | 5b2d5516ff1443a7f6eca087b430e6e47f7393f4 (patch) | |
| tree | ce44be2d4a37b302e7e675a135a5187f82232808 /overlay | |
| parent | 46b133c04103ff2e2d5c98710a1e1ec8dbc5efc5 (diff) | |
| parent | 34b5b9756cdc86ab9491938c8519b7ae8beecb6d (diff) | |
| download | vendor_replicant-5b2d5516ff1443a7f6eca087b430e6e47f7393f4.zip vendor_replicant-5b2d5516ff1443a7f6eca087b430e6e47f7393f4.tar.gz vendor_replicant-5b2d5516ff1443a7f6eca087b430e6e47f7393f4.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg | bin | 0 -> 347498 bytes |
| -rw-r--r-- | overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg | bin | 580160 -> 1585802 bytes |
| -rw-r--r-- | overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg | bin | 0 -> 2110716 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg Binary files differnew file mode 100644 index 0000000..aab9812 --- /dev/null +++ b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg Binary files differindex 90f40b4..ef645fe 100644 --- a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg +++ b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg Binary files differnew file mode 100644 index 0000000..1e56ad8 --- /dev/null +++ b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg |
