aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEd Heyl <edheyl@google.com>2013-10-16 18:01:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-16 18:01:56 -0700
commitaaabce8d30fd0eb6e217359c839a846037f8e091 (patch)
treea806ccddfcce70b3d1dfa3e76f94ce6573271901 /java
parent1d80262b6014b29d170e378d99a5ea0780530326 (diff)
parent46742367fbc484de6e0433eb9f5b5862c3f7d9cc (diff)
downloadlatinime-aaabce8d30fd0eb6e217359c839a846037f8e091.tar.gz
latinime-aaabce8d30fd0eb6e217359c839a846037f8e091.tar.xz
latinime-aaabce8d30fd0eb6e217359c839a846037f8e091.zip
am 46742367: am 09ecfc06: am cf0a94fa: merge in klp-release (no-op)
* 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)
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions