OSDN Git Service

am 3f27483f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
authorGeoff Mendal <mendal@google.com>
Mon, 2 Mar 2015 14:00:22 +0000 (14:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Mar 2015 14:00:22 +0000 (14:00 +0000)
commit7b43f3a2cbabdf9e23f27e5b77fa18d6911e4478
tree28074b5ac05e56d80c71b69d15ecb13593c63670
parentc9faf353d595e1af9905c0577ae326be8a04cf29
parent3f27483fc0d85ed91806029b491183428c1a5c01
am 3f27483f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '3f27483fc0d85ed91806029b491183428c1a5c01':
  Import translations. DO NOT MERGE