OSDN Git Service

am 40f84ca0: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 27 Oct 2014 20:37:04 +0000 (20:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 20:37:04 +0000 (20:37 +0000)
* commit '40f84ca02033ce62e301dd6d16fdc1f4b9a5326a':
  Import translations. DO NOT MERGE


Trivial merge