OSDN Git Service

am 8d889a67: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 18 Mar 2015 12:54:48 +0000 (12:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Mar 2015 12:54:48 +0000 (12:54 +0000)
* commit '8d889a67d079200fac0530542f48dd1d2fdedc4e':
  Import translations. DO NOT MERGE


Trivial merge