d28b96a55c
# Conflicts: # .idea/libraries/animated_vector_drawable_23_3_0.xml # .idea/libraries/appcompat_v7_23_3_0.xml # .idea/libraries/design_23_3_0.xml # .idea/libraries/recyclerview_v7_23_3_0.xml # .idea/libraries/support_annotations_23_3_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |