OSDN Git Service

am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
authorGeoff Mendal <mendal@google.com>
Wed, 17 Dec 2014 15:28:03 +0000 (15:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Dec 2014 15:28:03 +0000 (15:28 +0000)
commit13f57b848c99a9dc3535a13059d50e421a9f6697
tree34950a60d3eb6fbad31e57c3155547782c1a843d
parent1464dd2f925f4b6179a7ede287f13431e6835aec
parent0de823704d94d9e9e5cceccf4573afed4fd66b28
am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '0de823704d94d9e9e5cceccf4573afed4fd66b28':
  Import translations. DO NOT MERGE