OSDN Git Service

am 1d7f0341: (-s ours) am 4c875ca0: (-s ours) am 9ef51ffc: (-s ours) am d8296c0e...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 15:00:04 +0000 (15:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 15:00:04 +0000 (15:00 +0000)
commit46da5c3cf59bc9f871003bd08f1990ec661b026d
tree1a2f9f69674820540d354e52e905eeb43d03713d
parent225241184ee822b6323942899bb0a2114634c85e
parent1d7f0341de1ebe1cbe80eb3b5ea26a530bdf57e2
am 1d7f0341: (-s ours) am 4c875ca0: (-s ours) am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE

* commit '1d7f0341de1ebe1cbe80eb3b5ea26a530bdf57e2':
  Import translations. DO NOT MERGE