Conflicts:
	jni/sflphone

#14371: Add logger.h in opensllayer.cpp
#14371: Use Android Logging system
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android
#14371: Add delay in capture callback

#15046: release string pointers in placeCall
Merge branch 'android' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android
#14371: Uncomment start capture in opensl

#14741: stub history to complete manager init, fix warning

#15046: make outgoing call from java UI
#14698: get SIP log level from java env
#14399: remove warnings and clean up
#14399: remove warnings and clean up
#14650: fix manager init from Java UI and add JNI_OnUnLoad
#14741: fix history path
#14987: Move sleep in opensl callback instead of FillAudioBuffer
#14987: Remove common implmentation from opensl layer
Merge branch 'android' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android
#14987: Move common audio logic to AudioLayer
Merge branch 'android' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android
Merge branch 'master' into opus_codec2
  #14603: audiocodecs: resolve all undefined symbols before dlopen() returns and fail if this cannot be done
  #14603: fix includes for opus
  #14603: g729: load symbols in constructor
  #14603: opus: fix double free and lifetime issues
  #14603: opus: avoid payload type conflicting with video
  #14602: opus: only import functions that we need to call directly
  #14602: opus: cosmetics
Merge branch 'master' into opus_codec2
[#14602] codec/rtp: Change delay from 20 ms to 10 ms (G729 and Opus)
[#14602] alsa: Better handle alsa error detection
[#14602] codec: free opus codec memory in destructor
[#14602] codec: Multiply input buffer to convert 16bit->2x8bit
[#14602] codec: Changes values back to 16kHz
[#14602] codec: Ajust OPUS size to 12k (untested)
[#14602] codec: Ajust OPUS to work at 48k
[#14602] codec: Initial Opus implementation (untested)

Merge branch 'android' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android
#14919: Rename output files for debuging