OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 04:54:38 +0000 (04:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 04:54:38 +0000 (04:54 +0000)
commit68d6955b453d19229c45f66590aa2b7a6aa54d81
tree3bd0b376a6b583489378d108231b636734318a62
parentf21106b0e8efb116478644ccef190923e42c2e0d
parenta2b301d0e11de613c0f66c8856b2889aa245f92e
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: a2b301d0e1  -s ours

Change-Id: I33dcb6841acdee235a66dcf4f0900ee6cc041090