OSDN Git Service

am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 15 Dec 2014 15:25:44 +0000 (15:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Dec 2014 15:25:44 +0000 (15:25 +0000)
* commit '301a617698e74bb413df52f93ea7908a33423250':
  Import translations. DO NOT MERGE


Trivial merge