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

Commit 3dd10113 authored by Patrick Dubroy's avatar Patrick Dubroy
Browse files

resolved conflicts for merge of 242fa52b to master 

Change-Id: I6a6c134fe4fb05dbc15249661b441d88534acb1e
parent 5e25c2c1

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

+2.52 KiB (5.52 KiB)
Loading image diff...

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

+1.33 KiB (5.75 KiB)
Loading image diff...

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

+1.23 KiB (5.64 KiB)
Loading image diff...

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

+1.16 KiB (5.61 KiB)
Loading image diff...

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

+1.26 KiB (5.55 KiB)
Loading image diff...