OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 015210bc77 -s ours
authorBill Yi <byi@google.com>
Sat, 1 Jul 2017 17:05:04 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 17:05:04 +0000 (17:05 +0000)
commit2b4f3964b2366e1a291f518b1917677981d0f351
tree3377f20ca6fcfc2b5c2faee383b0cfe86099d247
parentb85d697565005ae3bf1e8cd52bf5a3453d759f37
parentbc29827898d3a781494847751398578ffc06f93d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 015210bc77  -s ours
am: bc29827898  -s ours

Change-Id: I1fb09a696c0c036a978fca5a3a2ca1a8ff5d313a