am cf0a94fa: merge in klp-release (no-op)

* commit 'cf0a94fa9a7c8a5b259507cab616239f79349444':
  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)
This commit is contained in:
Ed Heyl 2013-10-16 17:51:49 -07:00 committed by Android Git Automerger
commit 09ecfc062b

Diff content is not available