OSDN Git Service

am 3c1449d9: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 1 Dec 2014 19:46:32 +0000 (19:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Dec 2014 19:46:32 +0000 (19:46 +0000)
commitbfc2bfb5b6b7aa84fef6ce903dc8e9f1f10753c8
treee2c53fef61da727302c959452902f90d7f379600
parentc18dfd696e843892ca378319bfc4da60e7c61f3e
parent3c1449d9f6bcad5773067b11a8be8d88f8336f63
am 3c1449d9: (-s ours) Import translations. DO NOT MERGE

* commit '3c1449d9f6bcad5773067b11a8be8d88f8336f63':
  Import translations. DO NOT MERGE