aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-08-27 20:22:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 20:22:11 +0000
commitb0830cdcd729bc46506579d9db06d048753dc6aa (patch)
treec223dc0587b5c4cbce365eb8c243746e05fa3a4b /java
parent91f9541dcd35092e8d42a0cc479b7b03dc1610aa (diff)
parentd1a615e9a2ab2cd18277064091c243b9b7e61d82 (diff)
downloadlatinime-b0830cdcd729bc46506579d9db06d048753dc6aa.tar.gz
latinime-b0830cdcd729bc46506579d9db06d048753dc6aa.tar.xz
latinime-b0830cdcd729bc46506579d9db06d048753dc6aa.zip
am d1a615e9: (-s ours) am dbba2217: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'd1a615e9a2ab2cd18277064091c243b9b7e61d82':
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions