aboutsummaryrefslogtreecommitdiffstats
path: root/libs/emojicon/src/main/res/drawable-nodpi/emoji_1f201.png
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-07 15:36:16 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-07 15:36:16 +0200
commit36f3bed2eccb3dfd5266304c482497eff0d25c7c (patch)
treea43598541a1a4ea92142d17e02c02033e49fa8a3 /libs/emojicon/src/main/res/drawable-nodpi/emoji_1f201.png
parent4ace80d39ade18934d310ba37559c9c7ec8004dd (diff)
parent8c3245dd1f257053b8ec2bf7c5e03a3a98b282c3 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
Diffstat (limited to 'libs/emojicon/src/main/res/drawable-nodpi/emoji_1f201.png')
0 files changed, 0 insertions, 0 deletions