OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:12:42 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:12:42 +0000 (17:12 +0000)
commit498f780f42d39906ef634abada86eb750ce24fbb
tree5e46eb197f768d83838afb7541ca9d1a01dda85f
parent7d627e9cf08e2f827ca6de619a728fecce57c6ff
parent31cd8615b2cd7cf04e00a87c7981264c1b180356
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 31cd8615b2  -s ours

* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
  Import translations. DO NOT MERGE

Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508