OSDN Git Service

am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 22:04:15 +0000 (22:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 22:04:15 +0000 (22:04 +0000)
commitdc185a9b6493f5eacf69eb7a981c124b96352e78
tree3cead3619e9a265f6f2e0c82fdddf956a6b2da6a
parentcf38f8a7b5d9784276f5a7e9c3d047651ddde624
parent6bee46a1b4cbfc420d9c020bbab3d7821de7acbe
am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit '6bee46a1b4cbfc420d9c020bbab3d7821de7acbe':
  Import translations. DO NOT MERGE