OSDN Git Service

am e106bb8c: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:05 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:05 +0000 (11:19 +0000)
commit1d5ae08cd38c4356596de0406b586730f05a0498
tree3c0461c5c282480975dc6250f9835ccdde1adbea
parentcda6f85195fbc114a773e379d9bc4f3958a84924
parente106bb8c6ae49739512d1fe1ca38ba126ec253ff
am e106bb8c: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

* commit 'e106bb8c6ae49739512d1fe1ca38ba126ec253ff':