OSDN Git Service

am 5198624c: (-s ours) am ae87c907: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 16 Feb 2015 14:33:12 +0000 (14:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Feb 2015 14:33:12 +0000 (14:33 +0000)
* commit '5198624c2a4db659f0fea36ad6cbb66dc734d1e9':


Trivial merge