OSDN Git Service

am ac67a547: (-s ours) am 0c1ee954: (-s ours) am b4ac0141: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 17:15:24 +0000 (17:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 17:15:24 +0000 (17:15 +0000)
commit50c05b8a911ad80afb86fd77bfef0fc82822f493
tree4e9052ca12f00de06c77cb3ce93ab1eb160e691b
parent54336e0d815bb1f0b9b0de2d969caef7ca77a2c5
parentac67a547a5bc5ff97ba4c9937c51edf0651c58ed
am ac67a547: (-s ours) am 0c1ee954: (-s ours) am b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ac67a547a5bc5ff97ba4c9937c51edf0651c58ed':