OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 23 Aug 2016 14:22:54 +0000 (14:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 14:22:54 +0000 (14:22 +0000)
commitd6e2c3ff06c668f3e7765b7ca32ab8531b5e16d5
treeba2587706a8964c104eb429666f9157fa3cbcca6
parenta5b32eb0467fb71724fb522a769ac9eae1c39665
parent8aea3746cdf4fcef42c8b5c1bb1b1442c631890d
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8aea3746cd  -s ours

Change-Id: I1d30271721ea9549ad66d3230d54dee67713f2e1