OSDN Git Service

am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 17 Mar 2014 20:46:32 +0000 (20:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Mar 2014 20:46:32 +0000 (20:46 +0000)
* commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
  Import translations. DO NOT MERGE


Trivial merge