Margaux Clerc 1b207c8dc1 Merge remote-tracking branch 'linphone-android/master' into obiane ... Conflicts: AndroidManifest.xml res/drawable-xhdpi/topbar_avatar.png res/drawable/assistant_button.xml res/layout-land/call.xml res/layout-land/call_incoming.xml res/layout-land/call_outgoing.xml res/layout-land/chatlist_cell.xml res/layout-land/main.xml res/layout/about.xml res/layout/assistant_account_creation.xml res/layout/assistant_linphone_login.xml res/layout/assistant_remote_provisioning_login.xml res/layout/assistant_topbar.xml res/layout/call.xml res/layout/call_incoming.xml res/layout/call_outgoing.xml res/layout/chat.xml res/layout/chatlist.xml res/layout/chatlist_cell.xml res/layout/conference_paused_row.xml res/layout/contact.xml res/layout/contact_edit.xml res/layout/contacts_list.xml res/layout/dialog.xml res/layout/edit_list.xml res/layout/history.xml res/layout/history_detail.xml res/layout/main.xml res/layout/side_menu_account_cell.xml res/mipmap-hdpi/ic_launcher.png res/mipmap-mdpi/ic_launcher.png res/mipmap-xhdpi/ic_launcher.png res/mipmap-xxhdpi/ic_launcher.png res/mipmap-xxxhdpi/ic_launcher.png res/values-ar/strings.xml res/values-de/strings.xml res/values-es/strings.xml res/values-fr/custom.xml res/values-fr/strings.xml res/values-he/strings.xml res/values-ja/strings.xml res/values-nl/strings.xml res/values-ru/strings.xml res/values-tr/strings.xml res/values/custom.xml res/values/non_localizable_custom.xml res/values/strings.xml res/values/styles.xml src/org/linphone/CallActivity.java src/org/linphone/ChatFragment.java src/org/linphone/ChatListFragment.java src/org/linphone/ContactDetailsFragment.java src/org/linphone/ContactsListFragment.java src/org/linphone/HistoryDetailFragment.java src/org/linphone/HistoryListFragment.java src/org/linphone/LinphoneActivity.java src/org/linphone/LinphoneManager.java src/org/linphone/LinphoneService.java src/org/linphone/assistant/RemoteProvisioningActivity.java		2016-02-18 15:56:50 +01:00
..
anim	Bounce animation for missed calls	2012-07-13 14:19:57 +02:00
drawable	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
drawable-xhdpi	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
layout	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
layout-land	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
layout-sw533dp	Tablet: Add new dialer and fix edit in chat list	2016-02-12 17:43:35 +01:00
layout-sw533dp-land	Tablet: Add new dialer and fix edit in chat list	2016-02-12 17:43:35 +01:00
layout-sw720dp-land	Rename/Delete/add assets	2015-08-25 17:22:32 +02:00
mipmap-hdpi	Fix app icon for old android version	2016-01-19 11:30:31 +01:00
mipmap-mdpi	Fix app icon for old android version	2016-01-19 11:30:31 +01:00
mipmap-xhdpi	Fix app icon for old android version	2016-01-19 11:30:31 +01:00
mipmap-xxhdpi	Fix app icon for old android version	2016-01-19 11:30:31 +01:00
mipmap-xxxhdpi	Fix app icon for old android version	2016-01-19 11:30:31 +01:00
raw	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
raw-sw600dp	remove all references to application paths in linphonerc	2016-02-10 17:15:24 +01:00
values	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
values-fi	Update translations	2016-02-17 15:19:25 +01:00
values-fr	Update translations	2016-02-17 15:19:25 +01:00
values-pt-rBR	Update translations	2016-02-17 15:19:25 +01:00
values-sr	Update translations	2016-02-17 15:19:25 +01:00
values-sv	Update translations	2016-02-17 15:19:25 +01:00
values-sw533dp	Lower the minimal screen size requiered to switch to tablet layout (for kindles)	2013-10-14 17:12:32 +02:00
values-zh-rTW	Update translations	2016-02-17 15:19:25 +01:00
xml	Updated procedure for change package name + fixed crash when contacts sync account creation failed	2016-01-29 10:58:37 +01:00