OSDN Git Service

am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT...
authorWink Saville <wink@google.com>
Wed, 29 Oct 2014 22:53:44 +0000 (22:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 22:53:44 +0000 (22:53 +0000)
* commit '0d1356c4f1a6627e10b2c587a5e3f415e2da1064':
  Import translations. DO NOT MERGE


Trivial merge