OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 20:16:18 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 20:16:18 +0000 (20:16 +0000)
commit266eed8804bfcc637bcdf0e6a032be5a079a07fa
tree4030f955f0be0aa2043bfc0f62573874c9b9348d
parentcf53db3eb87fcdefdd379d83cbe4a83735849e51
parent79b7680773181a34fd831234cba81ed5a59ef451
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 79b7680773  -s ours

Change-Id: I7e91a70c32d7abb78eb8bff6aecb9ccb1f0c427b