OSDN Git Service

am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 23 Oct 2014 22:16:11 +0000 (22:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 22:16:11 +0000 (22:16 +0000)
commit78819ec30af2139b04bd39dde35fbbe3eaf33bae
tree968e4fe29a0239a3c5d2b05378e8f46d6d2175aa
parent1303f19b5f11fe492e4531239c28ae807efc2e5b
parentf62af382665f7a8c6d4968a6cb15a0cfb638c505
am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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