OSDN Git Service

am 8b88bcc7: (-s ours) am 80e4465b: (-s ours) am 80986508: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Dec 2014 19:59:59 +0000 (19:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Dec 2014 19:59:59 +0000 (19:59 +0000)
* commit '8b88bcc7513cdbf0c965cab7596bea39cb6a4405':
  Import translations. DO NOT MERGE


Trivial merge