OSDN Git Service

am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 20:36:52 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 20:36:52 +0000 (20:36 +0000)
* commit '91e2b2d232d7e106b5f688e4ce95d79f768ecf63':
  Import translations. DO NOT MERGE


Trivial merge