OSDN Git Service

am 06d14c52: (-s ours) am b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b...
authorGeoff Mendal <mendal@google.com>
Thu, 13 Aug 2015 06:55:08 +0000 (06:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Aug 2015 06:55:08 +0000 (06:55 +0000)
* commit '06d14c5243af84dfb2ba1a9027c9215b6d751d1e':
  Import translations. DO NOT MERGE


Trivial merge