OSDN Git Service

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3 -s ours
authorGeoff Mendal <mendal@google.com>
Wed, 3 Feb 2016 10:36:01 +0000 (10:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Feb 2016 10:36:01 +0000 (10:36 +0000)
commitb8783e59338a49eb160f6e7b66d10dc5b2b57b84
tree8d5310b1da89a5fa92ce081e6cef6811755f7129
parent3cddac44fd60e05047aa510b6d4973b47dec0475
parentaa7e0396c9bc23180bb856ae92081bd4e6b0da71
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3  -s ours
am: aa7e0396c9  -s ours

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