OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours...
authorBill Yi <byi@google.com>
Thu, 3 Aug 2017 01:40:06 +0000 (01:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:40:06 +0000 (01:40 +0000)
am: 3d57a96042  -s ours

Change-Id: I7bef4cc203c6d162f9333a5f4c2948cecc167e69


Trivial merge