am 5454a1e5: am 31a4cbf0: Merge "Fix bug #6495019 Character gets garbled when...
am 5454a1e5: am 31a4cbf0: Merge "Fix bug #6495019 Character gets garbled when locale is changed" into jb-dev
* commit '5454a1e5':
Fix bug #6495019 Character gets garbled when locale is changed