OSDN Git Service

am 6ab691b6: (-s ours) am f57c1564: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 17 Mar 2014 20:47:14 +0000 (20:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Mar 2014 20:47:14 +0000 (20:47 +0000)
* commit '6ab691b69ea9bc879c7ff854b5eb4f49cf0c864c':
  Import translations. DO NOT MERGE


Trivial merge