Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e6b4ad7 authored by Adam Powell's avatar Adam Powell
Browse files

resolved conflicts for merge of f61c3d07 to master 

Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
parents 37250130 f61c3d07

core/res/res/drawable-hdpi/dialog_bottom_holo_dark.9.png

−3.94 KiB (1.03 KiB)
Loading image diff...

core/res/res/drawable-hdpi/dialog_bottom_holo_light.9.png

−2.83 KiB (1.04 KiB)
Loading image diff...

core/res/res/drawable-hdpi/dialog_full_holo_dark.9.png

−7.31 KiB (1.81 KiB)
Loading image diff...

core/res/res/drawable-hdpi/dialog_full_holo_light.9.png

−5.13 KiB (1.81 KiB)
Loading image diff...

core/res/res/drawable-hdpi/dialog_middle_holo_dark.9.png

−103 B (250 B)
Loading image diff...