OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 8 Apr 2017 08:10:29 +0000 (08:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 8 Apr 2017 08:10:29 +0000 (08:10 +0000)
commit9e661d49bcef6afcbc236755bfc5000599d9e6e3
tree66d8dc47ef0609590429b4149d6e7b7831936887
parent5fe7eeb58fe31042e5e5d81b33a5d5e18f2faf77
parentc2f554292e9a79ef8d7d8295d31c472e013bc82e
Merge "Import translations. DO NOT MERGE" into oc-dev
am: c2f554292e  -s ours

Change-Id: Iaef9cda71205d4e67ab5311b509090278501a773