OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: d65fc69f4e -s ours
authorBill Yi <byi@google.com>
Fri, 30 Sep 2016 18:51:28 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 18:51:28 +0000 (18:51 +0000)
commit4a61fdc057322510fae043d5a2560e14bf38356a
tree3bfb7f9d5d7366ef11703498e83e18477508a951
parent84f86ec99cb327c0aeb2e7dfb8a2522a7cb8ee2b
parent69f203705bfa6f05ca1ea9f20120c09c128df72b
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: d65fc69f4e  -s ours
am: 69f203705b  -s ours

Change-Id: I86fa51dc1b351c0ba80d5b7401deb47484a7670d