OSDN Git Service

am f7282d21: (-s ours) am e7b79f16: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 19 Jan 2015 15:28:11 +0000 (15:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Jan 2015 15:28:11 +0000 (15:28 +0000)
commitedc6444af72f83a84e5215fc4eee4498f7a11b0d
treea36307776fba88e5b00b9d547ca9b07194d4ae31
parent80b03b607a09da452fabb9b4f311904a7457e00d
parentf7282d213ab2666471c2ffafe5e0e9c3dc144bbe
am f7282d21: (-s ours) am e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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