OSDN Git Service

am bc8c7914: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:33:30 +0000 (11:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:33:30 +0000 (11:33 +0000)
commit817e60422ae3c1fe9f2ba4cea0252d2975711ba5
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parenteeb54564015b6bfe20adb06e04b5b8382fd10cc5
parentbc8c7914287b365a5cbd76b0e28f290cea4da8a6
am bc8c7914: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE

* commit 'bc8c7914287b365a5cbd76b0e28f290cea4da8a6':