OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:43:15 +0000 (16:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:43:15 +0000 (16:43 +0000)
commit537d21f70bebdfc93cee395931e92502c239ccbc
tree3b53a21d3b383dc34908c5cb27d2931ed4b70b2e
parent24604a3a62a1bf79ec5b53bbc674a65f0ae59da3
parent1265a3d8962d7fc5476b5d5463d0258ca0677d9e
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f  -s ours am: ea0e76bc47  -s ours
am: 1265a3d896  -s ours

Change-Id: Id305e354d684c3b11fdb9c4c4f4b0dd2565b8be4