OSDN Git Service

am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Sat, 25 Jul 2015 15:54:27 +0000 (15:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Jul 2015 15:54:27 +0000 (15:54 +0000)
commitc0d5b79c7da6d9c8d5560a76df4674d0e2f59cd3
tree3a6640c512628898de939960dd0ab53c42b56457
parentb87428a61d99b920f4e4704709f6f2974346aba8
parent7b5c7e56553cfe6d8bcca5b56f8f96772b6f98ef
am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE

* commit '7b5c7e56553cfe6d8bcca5b56f8f96772b6f98ef':
  Import translations. DO NOT MERGE