fix merge with add_cahnnels

This commit is contained in:
Christian Schabesberger 2016-09-12 00:12:00 +02:00
commit 54ab0ab17e
79 changed files with 2611 additions and 1659 deletions

View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="@android:color/white"/>
<size
android:height="@dimen/channel_avatar_halo_size"
android:width="@dimen/channel_avatar_halo_size"/>
</shape>