OSDN Git Service

am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 7 Oct 2014 00:08:25 +0000 (00:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 00:08:25 +0000 (00:08 +0000)
* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
  Import translations. DO NOT MERGE


Trivial merge