OSDN Git Service

am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 19:42:31 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 19:42:31 +0000 (19:42 +0000)
commit56b7a690d1e4ca8bf50347b72f6dc2222d326db2
treed2658caf61ec2cb001e7fd6ccb93297d9b4d563c
parent93c6f4fc3a0459bad43efd02097c3f133cc0679b
parent14bd3435f306d0ece1715c8bd32e843d0f836fdd
am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE

* commit '14bd3435f306d0ece1715c8bd32e843d0f836fdd':
  Import translations. DO NOT MERGE