OSDN Git Service

am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 9 Oct 2014 13:03:02 +0000 (13:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Oct 2014 13:03:02 +0000 (13:03 +0000)
commit437e5c9c9a994efe795e72ffe4721055f077c4cf
tree56822cf1b6a1aa63fb9f9341e0992da7fef11469
parent301d2276f9d5208da7036b465203575a5eac8936
parentdb5b94d4050c169cf1c41aca8af83b1c0225c037
am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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