OSDN Git Service

am 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:25:10 +0000 (15:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:25:10 +0000 (15:25 +0000)
commit39a58e878c58579ab22b855a50d33398dbf5a7ff
tree6c609b081811e1254fb40632f46a01b37d5b2917
parentbfcdb7b41bcff438243fbaa02580af7f5202cf11
parent408606f31eb126bad9a8c1da28026ffe9c4943f4
am 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '408606f31eb126bad9a8c1da28026ffe9c4943f4':
  Import translations. DO NOT MERGE