OSDN Git Service

am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours
authorGeoff Mendal <mendal@google.com>
Mon, 27 Oct 2014 20:37:05 +0000 (20:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 20:37:05 +0000 (20:37 +0000)
commit967c000603e40704008a094cce3f3348acab7cf8
tree288ca692b1c9f6f6c6b59b5525696dedcb3b9866
parent9ab85cf0e01e2a96637c8a786a8df5fc5e0ccc65
parent855f0d264343325fb308bd27c509d7f95893d645
am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c  -s ours

* commit '855f0d264343325fb308bd27c509d7f95893d645':
  Import translations. DO NOT MERGE