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

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

* commit '09ecfc06':
  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 fb8346cb 09ecfc06

There are no changes