OSDN Git Service

am 9e218eaf: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 19:12:29 +0000 (19:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 19:12:29 +0000 (19:12 +0000)
commit987922d81e2948707b23af8dd7608e0a710c6b46
tree2f437fc33ac2de8e625c03cfd4f3e835b9b3a8f3
parent7e420ae0d6432a5236d10c018b4f42ab34441085
parent9e218eaf2398e72619ab8dcd596ca99bfc85746b
am 9e218eaf: (-s ours) Import translations. DO NOT MERGE

* commit '9e218eaf2398e72619ab8dcd596ca99bfc85746b':
  Import translations. DO NOT MERGE