OSDN Git Service

am 46de83aa: (-s ours) am cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378...
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 23:57:34 +0000 (23:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 23:57:34 +0000 (23:57 +0000)
* commit '46de83aa1c9f34e76706ba4250c69f2933a5d3c0':
  Import translations. DO NOT MERGE


Trivial merge