OSDN Git Service

am 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 16 Oct 2014 00:57:10 +0000 (00:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Oct 2014 00:57:10 +0000 (00:57 +0000)
* commit '78c00239df6d858c19a8243ad41ba96967e2fddc':
  Import translations. DO NOT MERGE


Trivial merge