OSDN Git Service

am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Tue, 7 Oct 2014 00:40:13 +0000 (00:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 00:40:13 +0000 (00:40 +0000)
* commit 'a6e09c12d402bc980952ca44648ee0ba5cd50182':
  Import translations. DO NOT MERGE


Trivial merge