OSDN Git Service

am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
authorGeoff Mendal <mendal@google.com>
Mon, 20 Jul 2015 14:32:47 +0000 (14:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Jul 2015 14:32:47 +0000 (14:32 +0000)
commitf3d1f3af76521e5d1c036016551c271c3112b8aa
tree3d8c3ec50c3010b51098ae7d2d8c4cddc2f1e4cb
parent7b2319d016ecc32ca42819a0f6caa62a9681d137
parent5cc92074091ad5223380bf65e22ad054e9f2211f
am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '5cc92074091ad5223380bf65e22ad054e9f2211f':
  Import translations. DO NOT MERGE