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:24:12 +0000 (13:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 13:24:12 +0000 (13:24 +0000)
commit3f3dfcb15b9d0dca041b935cc46946acbfa2ff06
tree189d455ad6273ae43dce9881a8a07d1605ae5ba9
parent03d7cde4c5ba0eb4195b7b91266ef10c3e85a574
parentccb925b17d751735427c44e05acc871b02d0028e
am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

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