OSDN Git Service

am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 13:22:05 +0000 (13:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 13:22:05 +0000 (13:22 +0000)
commite91f7eeffe83f35ade6f636369a2d4b7c1c260fe
tree1b43ca91c0d06ab9ae3f95a5d257551592b39bbd
parent212962d0e187ac02d7fd6b7bd7c49efea8b78235
parentccb925b17d751735427c44e05acc871b02d0028e
am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

* commit 'ccb925b17d751735427c44e05acc871b02d0028e':
  Import translations. DO NOT MERGE