OSDN Git Service

am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 23 Mar 2015 12:55:53 +0000 (12:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Mar 2015 12:55:53 +0000 (12:55 +0000)
* commit '674d1d6be522defb7934c9e66e439ed99e827bc4':
  Import translations. DO NOT MERGE


Trivial merge