OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c -s ours am: 00e13...
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:26:55 +0000 (15:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:26:55 +0000 (15:26 +0000)
commit30031e47f1385b6e89915efd2dffbde8a5b0e68b
tree45112cd50c1e6f3b0b2d817725e9de3a049a7a32
parent08adffae18e471e67e4cb8ab291fa13630b38fe9
parentdd11387dd1dc662c73763935afd1c1d496e12222
Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c  -s ours am: 00e13bb  -s ours
am: dd11387d  -s ours

* commit 'dd11387dd1dc662c73763935afd1c1d496e12222':
  Import translations. DO NOT MERGE

Change-Id: Ib91ba6485fbb071c811c811778f371a12cac6558