OSDN Git Service

am f8e1829c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 2 Dec 2013 20:45:29 +0000 (12:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Dec 2013 20:45:29 +0000 (12:45 -0800)
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE


Trivial merge