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

Commit ff3c191d authored by Gilles Debunne's avatar Gilles Debunne
Browse files

resolved conflicts for merge of 8390651c to master 

Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
parents ef52176f 8390651c

core/res/res/drawable-hdpi/stat_sys_battery_100.png

+854 B (1.76 KiB)
Loading image diff...

core/res/res/drawable-hdpi/stat_sys_battery_40.png

+781 B (1.63 KiB)
Loading image diff...

core/res/res/drawable-hdpi/stat_sys_battery_60.png

+811 B (1.67 KiB)
Loading image diff...

core/res/res/drawable-hdpi/stat_sys_battery_80.png

+812 B (1.66 KiB)
Loading image diff...

core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png

+836 B (1.9 KiB)
Loading image diff...