* upstream/master: (27 commits)
show 'using account …' in incoming call screen
show contact jid in call screen
bump copyright year
Add handling of status code 333
increase default pw length
do not build emoji flavors
pulled translations from transifex
add changelog
fix ice candidate sending when different credentials are used
remove security check that ensures rtp connection was properly finished
code clean up
bump agp
store encrypted pgp files in private cache dir
do not restart wakelock if activity is finishing
delete pre lolipop weOwnFile()
use try with resources. remove unused methods
rename version suffix to playstore/free
bump appcompat, migrate to emoji2 and get rid of emoji flavor
fix rare npe
store recordings and documents in their respective folders
...
5e149cfcd1