OSDN Git Service

am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 4 May 2015 12:52:11 +0000 (12:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 12:52:11 +0000 (12:52 +0000)
commit896262ef52c5de199d1ab3e59cab4f8efc2e37e8
treee7c2cb51ce3ddc043100830aa9b7cb8572b6895e
parent1c562bbb610ef83f328b53d88e4958383aea824c
parent577e34c9ebbf1ff09a6341e388795dec2c4fa92f
am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE

* commit '577e34c9ebbf1ff09a6341e388795dec2c4fa92f':
  Import translations. DO NOT MERGE