OSDN Git Service

am c88604bc: (-s ours) am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Wed, 25 Feb 2015 17:27:19 +0000 (17:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Feb 2015 17:27:19 +0000 (17:27 +0000)
commitf5b097e04486d3d641d20573412a7371a8557525
treedfa7bb9f144869f7fe6266887195fec9ddc1f040
parentf8952681a54c399c1b784c23d550192d240e6220
parentc88604bcb94ce23706767bf10db24ff23a68a4b5
am c88604bc: (-s ours) am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'c88604bcb94ce23706767bf10db24ff23a68a4b5':
  Import translations. DO NOT MERGE