OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 98bbb157a9 -s ours
authorBill Yi <byi@google.com>
Tue, 27 Jun 2017 20:19:36 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 20:19:36 +0000 (20:19 +0000)
commit5270ca6e25b85fb00802ccd2ef367b377a2c4218
tree6f3717aa83357dc8653c14fa0195b583fd58f8f6
parent83d8ac94dbcdf8d4ffe654a479723b64d4c49868
parent4b7bc479da7891367176c18c874cbfa98a59c020
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 98bbb157a9  -s ours
am: 4b7bc479da  -s ours

Change-Id: I22490d0da5e44774b6d2b5015bbf6f6e9e02ba5b