OSDN Git Service

am 149ceebc: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:34:38 +0000 (11:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:34:38 +0000 (11:34 +0000)
commitc60a59235d0805e2f18c15956c3520f587a29e32
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent4475b7712f75e1d6d1adf6064b35f7818c66081a
parent149ceebcedcdc986d89c3d983faf1c1a648406b8
am 149ceebc: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE

* commit '149ceebcedcdc986d89c3d983faf1c1a648406b8':