OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 20:36:29 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 20:36:29 +0000 (20:36 +0000)
commitc30ad68d13a7e0a94f919e5045971091deb72f68
tree07ef7b2792792862922d5a41de075ae985449218
parent3f070569a633c64ded60ba7e2715fc877f497c98
parente28f601df8c1167424e9c9b44efa06ccd3149b85
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: e28f601df8  -s ours

Change-Id: I80cb3c4098d7aaa180254a2043bc0b89e6a3ba14