mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Conflicts: AndroidManifest.xml res/layout/chat_bubble_alt_incoming.xml res/layout/chat_bubble_alt_outgoing.xml res/layout/chat_bubble_incoming.xml res/layout/chat_bubble_outgoing.xml res/values/strings.xml src/org/linphone/ContactsManager.java src/org/linphone/compatibility/ApiFivePlus.java src/org/linphone/ui/BubbleChat.java |
||
|---|---|---|
| .. | ||
| attrs.xml | ||
| color.xml | ||
| custom.xml | ||
| digit_style.xml | ||
| non_localizable_custom.xml | ||
| non_localizable_strings.xml | ||
| slidingtab_style.xml | ||
| strings.xml | ||
| styles.xml | ||