am a57519ce: (-s ours) am 0f5031ea: (-s ours) am b4b0a050: am 2e7f360a: Merge "Do not merge. Fix keyboard layout" into klp-dev
* commit 'a57519cedf1bc53b723d5a313cf7068d8d947a77': Do not merge. Fix keyboard layoutmain
commit
3d3182eec4
* commit 'a57519cedf1bc53b723d5a313cf7068d8d947a77': Do not merge. Fix keyboard layoutmain