Commit 09ecfc06 authored Oct 16, 2013 by Ed Heyl Committed by Android Git Automerger Oct 16, 2013

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

* commit 'cf0a94fa':
  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)

parents bfef552e cf0a94fa

There are no changes