OSDN Git Service

am db590124: (-s ours) am 6e523a07: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Tue, 18 Nov 2014 02:05:40 +0000 (02:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Nov 2014 02:05:40 +0000 (02:05 +0000)
* commit 'db5901244a6c64d9d042370fe6eff5ac89882568':
  Import translations. DO NOT MERGE


Trivial merge