OSDN Git Service

am f1e148c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 22:17:59 +0000 (22:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 22:17:59 +0000 (22:17 +0000)
commit80f283543b192a56952818c594ac30f473a28dd6
tree82ce40bde0f9f9df22a05203aa207e4db2b6ef96
parente74c772b11d5d3d059d793337c6ea5c898cb67c9
parentf1e148c5cf1d7eadc38b24ec8f686d6e5a16fc95
am f1e148c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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