OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:10:39 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:10:39 +0000 (21:10 +0000)
commit6ab6643d3e63496c84063a0cf6ec4e0a5daacfb4
tree6eabf8ba0608a0a5669a02e2b9e8fac368cba203
parent130f1a6b5e6aeec183996f7a78c67c1f9157d941
parent497bbfd9ac15c3f77807ac155e95a3207d36580a
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 497bbfd9ac  -s ours

Change-Id: I27a8de5dc0a587e0df6e6569f7703733c5d222fe