OSDN Git Service

am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:09:40 +0000 (14:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:09:40 +0000 (14:09 +0000)
commit45e0aa097a92d5019e69002871ccb337a9b3d7b1
treef0f2d138357f7a925e15ffdf182d22f7b649e62e
parent9ef51ffc17e2cdfe21311a89558c31633e3c1d6d
parent13688c8b7e84a2ff8017c33db35559b5d0fb878a
am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit '13688c8b7e84a2ff8017c33db35559b5d0fb878a':
  Import translations. DO NOT MERGE