OSDN Git Service

am 26a3e949: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 26 Jan 2015 15:16:47 +0000 (15:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Jan 2015 15:16:47 +0000 (15:16 +0000)
* commit '26a3e949c591fe2a51a84833fa1e835ea805efcb':
  Import translations. DO NOT MERGE


Trivial merge