OSDN Git Service

am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 6 Aug 2015 04:24:45 +0000 (04:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Aug 2015 04:24:45 +0000 (04:24 +0000)
* commit '18d8682802460074f4b0e628bae4d4051d542c77':
  Import translations. DO NOT MERGE


Trivial merge