OSDN Git Service

am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 16:11:30 +0000 (16:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 16:11:30 +0000 (16:11 +0000)
commit6b1e2a64def65d34e2faf0118db105e048b3a061
treed9b77aabdac342ed20fac1a1fe28a4046cfacc40
parent14d0c31a681c9db803f955a1989fc9a194c94543
parentff24828ed44a1d6c9ca8ba934f5cab4d092a728c
am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE

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