OSDN Git Service

am 37dfabff: (-s ours) am 713e794d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 9 Feb 2015 16:31:32 +0000 (16:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 9 Feb 2015 16:31:32 +0000 (16:31 +0000)
* commit '37dfabff82bd78d0956f41868579bdf5eb885078':
  Import translations. DO NOT MERGE


Trivial merge