OSDN Git Service

am 1d5af7b7: (-s ours) am 00831836: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 17:08:27 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 17:08:27 +0000 (17:08 +0000)
* commit '1d5af7b743fa32ca291d57a0b8b6998f7761c94d':
  Import translations. DO NOT MERGE


Trivial merge