am aaabce8d: am 46742367: am 09ecfc06: am cf0a94fa: merge in klp-release (no-op)
* commit 'aaabce8d30fd0eb6e217359c839a846037f8e091': Do not merge. Revert emoji key position to JB-mr2 Fix: Native crash when an empty attribute is written. DO NOT MERGE Use reentrant lock for main dictionaries. DO NOT MERGE Stop reading dictionary while regenerating. (DO NOT MERGE)main
commit
6bde9f3336