Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
..
drawable-hdpi-icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
drawable-ldpi-icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
drawable-mdpi-icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
drawable-xhdpi-icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
drawable-xxhdpi-icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
drawable-xxxhdpi-icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ