OSDN Git Service

am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours
authorGeoff Mendal <mendal@google.com>
Mon, 19 Oct 2015 14:17:11 +0000 (14:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 14:17:11 +0000 (14:17 +0000)
* commit '2a09706e86794f6482f005f5bcca2ee513a3b1d9':
  Import translations. DO NOT MERGE


Trivial merge