OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Sat, 5 Nov 2016 06:27:05 +0000 (06:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Nov 2016 06:27:05 +0000 (06:27 +0000)
commitf6e16b8604da29e5f1e0714bbb05aebba7115793
tree8645d9abdcc6e7fb5d276618b03ec087b380ca15
parenteff51c8addf2ceb011b3365b5d58c78ec36bc8bc
parentb26e27dc4af85dbcb3a9a5c7bee8eac008c33752
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: b26e27dc4a  -s ours

Change-Id: Ia37c90a128225718bc64f103382a0c7c7f35b635