OSDN Git Service

am d33d2127: (-s ours) am d3affe47: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 15 Dec 2014 14:43:37 +0000 (14:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Dec 2014 14:43:37 +0000 (14:43 +0000)
* commit 'd33d2127f739083c2f23a99eecd6bc3f21b53b83':
  Import translations. DO NOT MERGE


Trivial merge