OSDN Git Service

am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 16 Oct 2014 17:45:39 +0000 (17:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Oct 2014 17:45:39 +0000 (17:45 +0000)
* commit '0172dfef41dbd728b603d470bc4650290a2276b4':
  Import translations. DO NOT MERGE


Trivial merge