OSDN Git Service

am 1b1a08fd: (-s ours) am 9b07944c: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 15 Jan 2015 02:56:35 +0000 (02:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jan 2015 02:56:35 +0000 (02:56 +0000)
* commit '1b1a08fdb8675f233a9f0f4d5d42aea87770b174':
  Import translations. DO NOT MERGE


Trivial merge