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

Browse source

* commit '46742367fbc484de6e0433eb9f5b5862c3f7d9cc':
  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 18:01:56 -07:00 committed by Android Git Automerger

parent 1d80262b60 46742367fb

commit aaabce8d30

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available