OSDN Git Service

am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 14:07:49 +0000 (14:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 14:07:49 +0000 (14:07 +0000)
* commit '39217055fad3ee87bf912ac9a2ad7b186cf73eb4':
  Import translations. DO NOT MERGE


Trivial merge