OSDN Git Service

am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 6 Aug 2015 04:24:30 +0000 (04:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Aug 2015 04:24:30 +0000 (04:24 +0000)
commit870ba02933fa364660384944fa13ac0a94cab1b5
treef36038f59c76d5a625aa80658415c77a2c01a140
parent854533a82d5cfeac27e80b610544291c5be4fa39
parent40f6e9ab3ea41203d0ba1737713db58751e1995d
am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '40f6e9ab3ea41203d0ba1737713db58751e1995d':
  Import translations. DO NOT MERGE