OSDN Git Service

am 052e50dd: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 3 Aug 2015 14:18:20 +0000 (14:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Aug 2015 14:18:20 +0000 (14:18 +0000)
* commit '052e50dd7f736a812b032c0348e02e77c0c1f832':
  Import translations. DO NOT MERGE


Trivial merge