summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-07-15 17:12:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-15 17:12:21 +0000
commit5c2ca0ce0d5340e1b631419da4388b1443d4354f (patch)
treefbb275f0fe01e5ab5f39bf9b826b9652e345f4f5
parent34971369a659c1b348f73b16216892e9e99e2e6e (diff)
parent1cb0b3fb2a48bf1b5daf63f312989a133fb4b8ef (diff)
downloadBasic-5c2ca0ce0d5340e1b631419da4388b1443d4354f.tar.gz
am 1cb0b3fb: (-s ours) am 9f448819: (-s ours) am 86b877df: (-s ours) am cf2b3aea: (-s ours) Import translations. DO NOT MERGE
* commit '1cb0b3fb2a48bf1b5daf63f312989a133fb4b8ef': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions