OSDN Git Service

am 3b3f362c: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:14 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:14 +0000 (11:19 +0000)
commit7be68b1d4e5ece03dacc6374f6cc84320bab700a
tree3c0461c5c282480975dc6250f9835ccdde1adbea
parent8ee36d26ac32590c93cf1e37e8a97370f4b2b803
parent3b3f362c239517545a725b9ee4b5e3e12c42e06c
am 3b3f362c: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit '3b3f362c239517545a725b9ee4b5e3e12c42e06c':