OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795 -s ours am...
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:00:50 +0000 (18:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:00:50 +0000 (18:00 +0000)
am: 486a331392  -s ours

Change-Id: I1c2a9ebe6530b9d7da09f6f4e4fd406c67f38aca


Trivial merge