OSDN Git Service

am 4561b9e8: (-s ours) am 1303f19b: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 23 Oct 2014 00:03:23 +0000 (00:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 00:03:23 +0000 (00:03 +0000)
* commit '4561b9e834589e7b8921e446dd15a76a377dfeda':
  Import translations. DO NOT MERGE


Trivial merge