OSDN Git Service

am f962ec00: (-s ours) am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 00:42:24 +0000 (00:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 00:42:24 +0000 (00:42 +0000)
commit42bef58dc150756a864075419eba5ffb0f764c20
tree4b6dbf38946d03c857f41808e184c6a282a41a54
parent5c9598637a263a325dbe2d58fd0dfa7abe1d7c2a
parentf962ec00095ce774a5db134df1c19aa116d2e9ad
am f962ec00: (-s ours) am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

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