OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 26 May 2016 17:33:40 +0000 (17:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 17:33:40 +0000 (17:33 +0000)
commit97d29693d47a5297c303d52c52455037dd676ea1
treeaa8a1b39fdb88d3f5761e349ae22b70bfa6dcda7
parent24f6de59e5f7913665baa31a157d54fbe88cdf81
parent06b1de25afb1a2bfce1cfc38a88584efc7d73c2f
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 06b1de25af  -s ours

* commit '06b1de25afb1a2bfce1cfc38a88584efc7d73c2f':
  Import translations. DO NOT MERGE

Change-Id: Ic2199da26da3980ac74c09b92b6b39a83ec9e133