OSDN Git Service

am 070e7bf9: (-s ours) am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:32:14 +0000 (17:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:32:14 +0000 (17:32 +0000)
commit738e8bbcefc1060cf9771576f77e7714bc9c17d2
tree547117f668ea31f8424844206e27f34c81ed9547
parent36a58ecb8d978f927a418e4c9719b0609b066a6f
parent070e7bf9c737392c09e8438dae7a4c772075929b
am 070e7bf9: (-s ours) am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGE

* commit '070e7bf9c737392c09e8438dae7a4c772075929b':
  Import translations. DO NOT MERGE