OSDN Git Service

am 7f8dde71: (-s ours) am 12eae246: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 27 Feb 2015 16:41:53 +0000 (16:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Feb 2015 16:41:53 +0000 (16:41 +0000)
commite8946d3a079289597c9293e2dd6b0ebebdd4b34f
treed76396522d6dc89a983aa7d3ae230e0aca75b148
parent00a5b07418988d361a17b512d58eb17cf9dd2e30
parent7f8dde71857bb3bc6fc72b646988ce1f7f31f94e
am 7f8dde71: (-s ours) am 12eae246: (-s ours) Import translations. DO NOT MERGE

* commit '7f8dde71857bb3bc6fc72b646988ce1f7f31f94e':
  Import translations. DO NOT MERGE