OSDN Git Service

am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:17:19 +0000 (17:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:17:19 +0000 (17:17 +0000)
commit070e7bf9c737392c09e8438dae7a4c772075929b
tree547117f668ea31f8424844206e27f34c81ed9547
parent447a1008c638706092aae7620079060ec3a0c74c
parentc683cef233646d21e21e49df095836a4986005dd
am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGE

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