OSDN Git Service

am e1875783: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:32:15 +0000 (11:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:32:15 +0000 (11:32 +0000)
commit054e904ad1b0260bad91d656ad28fff11c96980f
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent38de1548c9c43a9777bcfd50cc552753f98aa87c
parente18757830920dcce30c78942582a0702a75806d0
am e1875783: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE

* commit 'e18757830920dcce30c78942582a0702a75806d0':