OSDN Git Service

am 0bb8ba32: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 2 Feb 2015 15:30:26 +0000 (15:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Feb 2015 15:30:26 +0000 (15:30 +0000)
* commit '0bb8ba322e0bed9d988e14888079c5d6283cfacc':
  Import translations. DO NOT MERGE


Trivial merge