OSDN Git Service

am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 13:31:15 +0000 (13:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 13:31:15 +0000 (13:31 +0000)
* commit '3f3dfcb15b9d0dca041b935cc46946acbfa2ff06':
  Import translations. DO NOT MERGE


Trivial merge