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