OSDN Git Service

am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 5 Aug 2015 14:38:27 +0000 (14:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Aug 2015 14:38:27 +0000 (14:38 +0000)
* commit '38911d7a719483ab5f3a7ea18608774183229091':
  Import translations. DO NOT MERGE


Trivial merge