Diff attached.
To avoid conflicts, please change the name of file ' /data/media/icon.png' to '/data/media/chinaweather.png' before apply this diff, thanks.
Diff attached.
To avoid conflicts, please change the name of file ' /data/media/ icon.png' to '/data/ media/chinaweat her.png' before apply this diff, thanks.