OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b14995516a -s ours
authorBill Yi <byi@google.com>
Sat, 5 Nov 2016 06:47:55 +0000 (06:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Nov 2016 06:47:55 +0000 (06:47 +0000)
commit38c2817cde790cccd981ff0e2c79de879afb04a4
tree0eb43f46f7d791b8f3520dbe3362b32186faca1c
parentda60d2b57b38f09d41c498ffe8ef6c95081439cc
parent9fbeb40fc983154680ece48b39813663babfcf6a
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b14995516a  -s ours
am: 9fbeb40fc9  -s ours

Change-Id: If318447c1a74e2bf80522b2e866e4bf3b7c7c667