aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-11 00:27:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-11 00:27:56 -0700
commitff82b5fee1d2bb187dc7422885b7da68e49fbb14 (patch)
tree4768324434177655da3e7eb0f95e6ef6d52dee4d /java
parentc16be0237eb213ea473d985a2f61f89264126102 (diff)
parented7d262eeb86b1f336ca9b79db072aa53ac956fb (diff)
downloadlatinime-ff82b5fee1d2bb187dc7422885b7da68e49fbb14.tar.gz
latinime-ff82b5fee1d2bb187dc7422885b7da68e49fbb14.tar.xz
latinime-ff82b5fee1d2bb187dc7422885b7da68e49fbb14.zip
am ed7d262e: (-s ours) am 16b2dd43: (-s ours) am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
* commit 'ed7d262eeb86b1f336ca9b79db072aa53ac956fb': Do not merge. Save / restore the last used emoji category
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions