OSDN Git Service

am 521c3909: (-s ours) am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 00:42:23 +0000 (00:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 00:42:23 +0000 (00:42 +0000)
* commit '521c390994117d6d2b819bf9f69c4e31fc305e22':
  Import translations. DO NOT MERGE


Trivial merge