OSDN Git Service

am 2f805f0d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
authorGeoff Mendal <mendal@google.com>
Thu, 4 Dec 2014 15:15:45 +0000 (15:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Dec 2014 15:15:45 +0000 (15:15 +0000)
* commit '2f805f0d00b6521d6f6be25b615b3aff1b8f621d':
  Import translations. DO NOT MERGE


Trivial merge