OSDN Git Service

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Mon, 12 Jan 2015 17:19:25 +0000 (17:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jan 2015 17:19:25 +0000 (17:19 +0000)
commiteb99c8260252a90ff329f834b3b18088236d53f2
treee64468d59376cdd075892266e3303401edbb4636
parent979dc00bb9061d4bf448b9880096a323d06f19dd
parent8858db6b7eaabd5ce4356c9a48dff082c3af21d5
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: 8858db6  -s ours

* commit '8858db6b7eaabd5ce4356c9a48dff082c3af21d5':
  Import translations. DO NOT MERGE