OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 14 Oct 2016 09:10:07 +0000 (09:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 09:10:07 +0000 (09:10 +0000)
commitfca9f14523ca5396c342400873aad88ffac8464a
treedc9a739f5975436d57d976b224c793676c1b7b6d
parenta4999db81671ce389ffa6b60f25e266561a3154a
parente3c1d48dc0f9fb0b18cd95a12eba404d29a15b8e
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: e3c1d48dc0  -s ours

Change-Id: Ia3d8d98b07f606740644edf3b02f69be93d18a68