OSDN Git Service

am c5fdbe82: (-s ours) am 3a92fb26: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 17 Dec 2014 14:42:24 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Dec 2014 14:42:24 +0000 (14:42 +0000)
* commit 'c5fdbe8271f6f34baa27521d6146fbc6e7429a58':
  Import translations. DO NOT MERGE


Trivial merge