OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6300674d27 -s ours
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 13:30:51 +0000 (13:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 13:30:51 +0000 (13:30 +0000)
commitc8c242379a87347d18cbe01fe111513163a72925
tree370e4a48c6e88dee1fd3e0bb55cd111c5c1ca8a7
parenta90c3c8948c678b92fafffe30bf393ff911ea769
parent995b3898c43483b35837cc338fe022b5d8ea3c4d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6300674d27  -s ours
am: 995b3898c4  -s ours

Change-Id: I8be17d45e727141f2d6690a2afa02526c9eb50a0