OSDN Git Service

am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 24 Jul 2015 03:26:33 +0000 (03:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Jul 2015 03:26:33 +0000 (03:26 +0000)
* commit 'cb113be57e3eb49871c77ce5317d644963e033af':
  Import translations. DO NOT MERGE


Trivial merge