OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Mon, 15 Oct 2018 10:43:36 +0000 (03:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 10:43:36 +0000 (03:43 -0700)
commitb30e7a282b13af9dd9160936b01b5f21e0579f9c
tree3b24ddf748c98592b3faa3856a34501afa8c046f
parent03d627c135853ea9b7cf7ddb803e10b35a4ff163
parented5f4fc0373ad0b56bf7686114dac00082dcb3e4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ed5f4fc037  -s ours

Change-Id: Ie39eaa92091b5e133898a8ef05210727654581e1